Bug 1102213: Move security/sandbox/win/ into security/sandbox/chromium/sandbox/ r=ted
☠☠ backed out by 3191c1dd399b ☠ ☠
authorBob Owen <bobowencode@gmail.com>
Thu, 22 Jan 2015 08:37:31 +0000
changeset 225120 c607c8d4dacfc947942fa1bd4ab626f5faa16ef1
parent 225119 43f1f9eef449ef029ab5b2d54552e3de4203c2a6
child 225121 ef4823baf754fb57cc5604d5d088118a80073c16
push id28153
push userkwierso@gmail.com
push dateThu, 22 Jan 2015 22:31:53 +0000
treeherdermozilla-central@568bbf124221 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1102213
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1102213: Move security/sandbox/win/ into security/sandbox/chromium/sandbox/ r=ted
security/sandbox/chromium-shim/base/strings/string_piece.h
security/sandbox/chromium/sandbox/win/src/Wow64.cc
security/sandbox/chromium/sandbox/win/src/Wow64.h
security/sandbox/chromium/sandbox/win/src/Wow64_64.cc
security/sandbox/chromium/sandbox/win/src/acl.cc
security/sandbox/chromium/sandbox/win/src/acl.h
security/sandbox/chromium/sandbox/win/src/app_container.cc
security/sandbox/chromium/sandbox/win/src/app_container.h
security/sandbox/chromium/sandbox/win/src/app_container_test.cc
security/sandbox/chromium/sandbox/win/src/app_container_unittest.cc
security/sandbox/chromium/sandbox/win/src/broker_services.cc
security/sandbox/chromium/sandbox/win/src/broker_services.h
security/sandbox/chromium/sandbox/win/src/crosscall_client.h
security/sandbox/chromium/sandbox/win/src/crosscall_params.h
security/sandbox/chromium/sandbox/win/src/crosscall_server.cc
security/sandbox/chromium/sandbox/win/src/crosscall_server.h
security/sandbox/chromium/sandbox/win/src/eat_resolver.cc
security/sandbox/chromium/sandbox/win/src/eat_resolver.h
security/sandbox/chromium/sandbox/win/src/file_policy_test.cc
security/sandbox/chromium/sandbox/win/src/filesystem_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/filesystem_dispatcher.h
security/sandbox/chromium/sandbox/win/src/filesystem_interception.cc
security/sandbox/chromium/sandbox/win/src/filesystem_interception.h
security/sandbox/chromium/sandbox/win/src/filesystem_policy.cc
security/sandbox/chromium/sandbox/win/src/filesystem_policy.h
security/sandbox/chromium/sandbox/win/src/handle_closer.cc
security/sandbox/chromium/sandbox/win/src/handle_closer.h
security/sandbox/chromium/sandbox/win/src/handle_closer_agent.cc
security/sandbox/chromium/sandbox/win/src/handle_closer_agent.h
security/sandbox/chromium/sandbox/win/src/handle_closer_test.cc
security/sandbox/chromium/sandbox/win/src/handle_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/handle_dispatcher.h
security/sandbox/chromium/sandbox/win/src/handle_inheritance_test.cc
security/sandbox/chromium/sandbox/win/src/handle_interception.cc
security/sandbox/chromium/sandbox/win/src/handle_interception.h
security/sandbox/chromium/sandbox/win/src/handle_policy.cc
security/sandbox/chromium/sandbox/win/src/handle_policy.h
security/sandbox/chromium/sandbox/win/src/handle_policy_test.cc
security/sandbox/chromium/sandbox/win/src/handle_table.cc
security/sandbox/chromium/sandbox/win/src/handle_table.h
security/sandbox/chromium/sandbox/win/src/integrity_level_test.cc
security/sandbox/chromium/sandbox/win/src/interception.cc
security/sandbox/chromium/sandbox/win/src/interception.h
security/sandbox/chromium/sandbox/win/src/interception_agent.cc
security/sandbox/chromium/sandbox/win/src/interception_agent.h
security/sandbox/chromium/sandbox/win/src/interception_internal.h
security/sandbox/chromium/sandbox/win/src/interception_unittest.cc
security/sandbox/chromium/sandbox/win/src/interceptors.h
security/sandbox/chromium/sandbox/win/src/interceptors_64.cc
security/sandbox/chromium/sandbox/win/src/interceptors_64.h
security/sandbox/chromium/sandbox/win/src/internal_types.h
security/sandbox/chromium/sandbox/win/src/ipc_ping_test.cc
security/sandbox/chromium/sandbox/win/src/ipc_tags.h
security/sandbox/chromium/sandbox/win/src/ipc_unittest.cc
security/sandbox/chromium/sandbox/win/src/job.cc
security/sandbox/chromium/sandbox/win/src/job.h
security/sandbox/chromium/sandbox/win/src/job_unittest.cc
security/sandbox/chromium/sandbox/win/src/named_pipe_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/named_pipe_dispatcher.h
security/sandbox/chromium/sandbox/win/src/named_pipe_interception.cc
security/sandbox/chromium/sandbox/win/src/named_pipe_interception.h
security/sandbox/chromium/sandbox/win/src/named_pipe_policy.cc
security/sandbox/chromium/sandbox/win/src/named_pipe_policy.h
security/sandbox/chromium/sandbox/win/src/named_pipe_policy_test.cc
security/sandbox/chromium/sandbox/win/src/nt_internals.h
security/sandbox/chromium/sandbox/win/src/policy_broker.cc
security/sandbox/chromium/sandbox/win/src/policy_broker.h
security/sandbox/chromium/sandbox/win/src/policy_engine_opcodes.cc
security/sandbox/chromium/sandbox/win/src/policy_engine_opcodes.h
security/sandbox/chromium/sandbox/win/src/policy_engine_params.h
security/sandbox/chromium/sandbox/win/src/policy_engine_processor.cc
security/sandbox/chromium/sandbox/win/src/policy_engine_processor.h
security/sandbox/chromium/sandbox/win/src/policy_engine_unittest.cc
security/sandbox/chromium/sandbox/win/src/policy_low_level.cc
security/sandbox/chromium/sandbox/win/src/policy_low_level.h
security/sandbox/chromium/sandbox/win/src/policy_low_level_unittest.cc
security/sandbox/chromium/sandbox/win/src/policy_opcodes_unittest.cc
security/sandbox/chromium/sandbox/win/src/policy_params.h
security/sandbox/chromium/sandbox/win/src/policy_target.cc
security/sandbox/chromium/sandbox/win/src/policy_target.h
security/sandbox/chromium/sandbox/win/src/policy_target_test.cc
security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
security/sandbox/chromium/sandbox/win/src/process_mitigations.h
security/sandbox/chromium/sandbox/win/src/process_mitigations_test.cc
security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_dispatcher.h
security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_interception.cc
security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_interception.h
security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_policy.cc
security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_policy.h
security/sandbox/chromium/sandbox/win/src/process_policy_test.cc
security/sandbox/chromium/sandbox/win/src/process_thread_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/process_thread_dispatcher.h
security/sandbox/chromium/sandbox/win/src/process_thread_interception.cc
security/sandbox/chromium/sandbox/win/src/process_thread_interception.h
security/sandbox/chromium/sandbox/win/src/process_thread_policy.cc
security/sandbox/chromium/sandbox/win/src/process_thread_policy.h
security/sandbox/chromium/sandbox/win/src/registry_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/registry_dispatcher.h
security/sandbox/chromium/sandbox/win/src/registry_interception.cc
security/sandbox/chromium/sandbox/win/src/registry_interception.h
security/sandbox/chromium/sandbox/win/src/registry_policy.cc
security/sandbox/chromium/sandbox/win/src/registry_policy.h
security/sandbox/chromium/sandbox/win/src/registry_policy_test.cc
security/sandbox/chromium/sandbox/win/src/resolver.cc
security/sandbox/chromium/sandbox/win/src/resolver.h
security/sandbox/chromium/sandbox/win/src/resolver_32.cc
security/sandbox/chromium/sandbox/win/src/resolver_64.cc
security/sandbox/chromium/sandbox/win/src/restricted_token.cc
security/sandbox/chromium/sandbox/win/src/restricted_token.h
security/sandbox/chromium/sandbox/win/src/restricted_token_unittest.cc
security/sandbox/chromium/sandbox/win/src/restricted_token_utils.cc
security/sandbox/chromium/sandbox/win/src/restricted_token_utils.h
security/sandbox/chromium/sandbox/win/src/sandbox.cc
security/sandbox/chromium/sandbox/win/src/sandbox.h
security/sandbox/chromium/sandbox/win/src/sandbox.vcproj
security/sandbox/chromium/sandbox/win/src/sandbox_factory.h
security/sandbox/chromium/sandbox/win/src/sandbox_globals.cc
security/sandbox/chromium/sandbox/win/src/sandbox_nt_types.h
security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.cc
security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.h
security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.cc
security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.h
security/sandbox/chromium/sandbox/win/src/sandbox_types.h
security/sandbox/chromium/sandbox/win/src/sandbox_utils.cc
security/sandbox/chromium/sandbox/win/src/sandbox_utils.h
security/sandbox/chromium/sandbox/win/src/security_level.h
security/sandbox/chromium/sandbox/win/src/service_resolver.cc
security/sandbox/chromium/sandbox/win/src/service_resolver.h
security/sandbox/chromium/sandbox/win/src/service_resolver_32.cc
security/sandbox/chromium/sandbox/win/src/service_resolver_64.cc
security/sandbox/chromium/sandbox/win/src/service_resolver_unittest.cc
security/sandbox/chromium/sandbox/win/src/shared_handles.cc
security/sandbox/chromium/sandbox/win/src/shared_handles.h
security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.cc
security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.h
security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_server.cc
security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_server.h
security/sandbox/chromium/sandbox/win/src/sid.cc
security/sandbox/chromium/sandbox/win/src/sid.h
security/sandbox/chromium/sandbox/win/src/sid_unittest.cc
security/sandbox/chromium/sandbox/win/src/sidestep/ia32_modrm_map.cpp
security/sandbox/chromium/sandbox/win/src/sidestep/ia32_opcode_map.cpp
security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler.cpp
security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler.h
security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler_types.h
security/sandbox/chromium/sandbox/win/src/sidestep/preamble_patcher.h
security/sandbox/chromium/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp
security/sandbox/chromium/sandbox/win/src/sidestep_resolver.cc
security/sandbox/chromium/sandbox/win/src/sidestep_resolver.h
security/sandbox/chromium/sandbox/win/src/sync_dispatcher.cc
security/sandbox/chromium/sandbox/win/src/sync_dispatcher.h
security/sandbox/chromium/sandbox/win/src/sync_interception.cc
security/sandbox/chromium/sandbox/win/src/sync_interception.h
security/sandbox/chromium/sandbox/win/src/sync_policy.cc
security/sandbox/chromium/sandbox/win/src/sync_policy.h
security/sandbox/chromium/sandbox/win/src/sync_policy_test.cc
security/sandbox/chromium/sandbox/win/src/sync_policy_test.h
security/sandbox/chromium/sandbox/win/src/target_interceptions.cc
security/sandbox/chromium/sandbox/win/src/target_interceptions.h
security/sandbox/chromium/sandbox/win/src/target_process.cc
security/sandbox/chromium/sandbox/win/src/target_process.h
security/sandbox/chromium/sandbox/win/src/target_services.cc
security/sandbox/chromium/sandbox/win/src/target_services.h
security/sandbox/chromium/sandbox/win/src/threadpool_unittest.cc
security/sandbox/chromium/sandbox/win/src/unload_dll_test.cc
security/sandbox/chromium/sandbox/win/src/win2k_threadpool.cc
security/sandbox/chromium/sandbox/win/src/win2k_threadpool.h
security/sandbox/chromium/sandbox/win/src/win_utils.cc
security/sandbox/chromium/sandbox/win/src/win_utils.h
security/sandbox/chromium/sandbox/win/src/win_utils_unittest.cc
security/sandbox/chromium/sandbox/win/src/window.cc
security/sandbox/chromium/sandbox/win/src/window.h
security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
security/sandbox/moz-chromium-commit-status.txt
security/sandbox/moz.build
security/sandbox/objs.mozbuild
security/sandbox/staticruntime/moz.build
security/sandbox/win/src/LICENSE
security/sandbox/win/src/Wow64.cc
security/sandbox/win/src/Wow64.h
security/sandbox/win/src/Wow64_64.cc
security/sandbox/win/src/acl.cc
security/sandbox/win/src/acl.h
security/sandbox/win/src/app_container.cc
security/sandbox/win/src/app_container.h
security/sandbox/win/src/app_container_test.cc
security/sandbox/win/src/app_container_unittest.cc
security/sandbox/win/src/broker_services.cc
security/sandbox/win/src/broker_services.h
security/sandbox/win/src/crosscall_client.h
security/sandbox/win/src/crosscall_params.h
security/sandbox/win/src/crosscall_server.cc
security/sandbox/win/src/crosscall_server.h
security/sandbox/win/src/eat_resolver.cc
security/sandbox/win/src/eat_resolver.h
security/sandbox/win/src/file_policy_test.cc
security/sandbox/win/src/filesystem_dispatcher.cc
security/sandbox/win/src/filesystem_dispatcher.h
security/sandbox/win/src/filesystem_interception.cc
security/sandbox/win/src/filesystem_interception.h
security/sandbox/win/src/filesystem_policy.cc
security/sandbox/win/src/filesystem_policy.h
security/sandbox/win/src/handle_closer.cc
security/sandbox/win/src/handle_closer.h
security/sandbox/win/src/handle_closer_agent.cc
security/sandbox/win/src/handle_closer_agent.h
security/sandbox/win/src/handle_closer_test.cc
security/sandbox/win/src/handle_dispatcher.cc
security/sandbox/win/src/handle_dispatcher.h
security/sandbox/win/src/handle_inheritance_test.cc
security/sandbox/win/src/handle_interception.cc
security/sandbox/win/src/handle_interception.h
security/sandbox/win/src/handle_policy.cc
security/sandbox/win/src/handle_policy.h
security/sandbox/win/src/handle_policy_test.cc
security/sandbox/win/src/handle_table.cc
security/sandbox/win/src/handle_table.h
security/sandbox/win/src/integrity_level_test.cc
security/sandbox/win/src/interception.cc
security/sandbox/win/src/interception.h
security/sandbox/win/src/interception_agent.cc
security/sandbox/win/src/interception_agent.h
security/sandbox/win/src/interception_internal.h
security/sandbox/win/src/interception_unittest.cc
security/sandbox/win/src/interceptors.h
security/sandbox/win/src/interceptors_64.cc
security/sandbox/win/src/interceptors_64.h
security/sandbox/win/src/internal_types.h
security/sandbox/win/src/ipc_ping_test.cc
security/sandbox/win/src/ipc_tags.h
security/sandbox/win/src/ipc_unittest.cc
security/sandbox/win/src/job.cc
security/sandbox/win/src/job.h
security/sandbox/win/src/job_unittest.cc
security/sandbox/win/src/named_pipe_dispatcher.cc
security/sandbox/win/src/named_pipe_dispatcher.h
security/sandbox/win/src/named_pipe_interception.cc
security/sandbox/win/src/named_pipe_interception.h
security/sandbox/win/src/named_pipe_policy.cc
security/sandbox/win/src/named_pipe_policy.h
security/sandbox/win/src/named_pipe_policy_test.cc
security/sandbox/win/src/nt_internals.h
security/sandbox/win/src/policy_broker.cc
security/sandbox/win/src/policy_broker.h
security/sandbox/win/src/policy_engine_opcodes.cc
security/sandbox/win/src/policy_engine_opcodes.h
security/sandbox/win/src/policy_engine_params.h
security/sandbox/win/src/policy_engine_processor.cc
security/sandbox/win/src/policy_engine_processor.h
security/sandbox/win/src/policy_engine_unittest.cc
security/sandbox/win/src/policy_low_level.cc
security/sandbox/win/src/policy_low_level.h
security/sandbox/win/src/policy_low_level_unittest.cc
security/sandbox/win/src/policy_opcodes_unittest.cc
security/sandbox/win/src/policy_params.h
security/sandbox/win/src/policy_target.cc
security/sandbox/win/src/policy_target.h
security/sandbox/win/src/policy_target_test.cc
security/sandbox/win/src/process_mitigations.cc
security/sandbox/win/src/process_mitigations.h
security/sandbox/win/src/process_mitigations_test.cc
security/sandbox/win/src/process_mitigations_win32k_dispatcher.cc
security/sandbox/win/src/process_mitigations_win32k_dispatcher.h
security/sandbox/win/src/process_mitigations_win32k_interception.cc
security/sandbox/win/src/process_mitigations_win32k_interception.h
security/sandbox/win/src/process_mitigations_win32k_policy.cc
security/sandbox/win/src/process_mitigations_win32k_policy.h
security/sandbox/win/src/process_policy_test.cc
security/sandbox/win/src/process_thread_dispatcher.cc
security/sandbox/win/src/process_thread_dispatcher.h
security/sandbox/win/src/process_thread_interception.cc
security/sandbox/win/src/process_thread_interception.h
security/sandbox/win/src/process_thread_policy.cc
security/sandbox/win/src/process_thread_policy.h
security/sandbox/win/src/registry_dispatcher.cc
security/sandbox/win/src/registry_dispatcher.h
security/sandbox/win/src/registry_interception.cc
security/sandbox/win/src/registry_interception.h
security/sandbox/win/src/registry_policy.cc
security/sandbox/win/src/registry_policy.h
security/sandbox/win/src/registry_policy_test.cc
security/sandbox/win/src/resolver.cc
security/sandbox/win/src/resolver.h
security/sandbox/win/src/resolver_32.cc
security/sandbox/win/src/resolver_64.cc
security/sandbox/win/src/restricted_token.cc
security/sandbox/win/src/restricted_token.h
security/sandbox/win/src/restricted_token_unittest.cc
security/sandbox/win/src/restricted_token_utils.cc
security/sandbox/win/src/restricted_token_utils.h
security/sandbox/win/src/sandbox.cc
security/sandbox/win/src/sandbox.h
security/sandbox/win/src/sandbox.vcproj
security/sandbox/win/src/sandbox_factory.h
security/sandbox/win/src/sandbox_globals.cc
security/sandbox/win/src/sandbox_nt_types.h
security/sandbox/win/src/sandbox_nt_util.cc
security/sandbox/win/src/sandbox_nt_util.h
security/sandbox/win/src/sandbox_policy.h
security/sandbox/win/src/sandbox_policy_base.cc
security/sandbox/win/src/sandbox_policy_base.h
security/sandbox/win/src/sandbox_types.h
security/sandbox/win/src/sandbox_utils.cc
security/sandbox/win/src/sandbox_utils.h
security/sandbox/win/src/sandboxbroker/moz.build
security/sandbox/win/src/security_level.h
security/sandbox/win/src/service_resolver.cc
security/sandbox/win/src/service_resolver.h
security/sandbox/win/src/service_resolver_32.cc
security/sandbox/win/src/service_resolver_64.cc
security/sandbox/win/src/service_resolver_unittest.cc
security/sandbox/win/src/shared_handles.cc
security/sandbox/win/src/shared_handles.h
security/sandbox/win/src/sharedmem_ipc_client.cc
security/sandbox/win/src/sharedmem_ipc_client.h
security/sandbox/win/src/sharedmem_ipc_server.cc
security/sandbox/win/src/sharedmem_ipc_server.h
security/sandbox/win/src/sid.cc
security/sandbox/win/src/sid.h
security/sandbox/win/src/sid_unittest.cc
security/sandbox/win/src/sidestep/ia32_modrm_map.cpp
security/sandbox/win/src/sidestep/ia32_opcode_map.cpp
security/sandbox/win/src/sidestep/mini_disassembler.cpp
security/sandbox/win/src/sidestep/mini_disassembler.h
security/sandbox/win/src/sidestep/mini_disassembler_types.h
security/sandbox/win/src/sidestep/preamble_patcher.h
security/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp
security/sandbox/win/src/sidestep_resolver.cc
security/sandbox/win/src/sidestep_resolver.h
security/sandbox/win/src/sync_dispatcher.cc
security/sandbox/win/src/sync_dispatcher.h
security/sandbox/win/src/sync_interception.cc
security/sandbox/win/src/sync_interception.h
security/sandbox/win/src/sync_policy.cc
security/sandbox/win/src/sync_policy.h
security/sandbox/win/src/sync_policy_test.cc
security/sandbox/win/src/sync_policy_test.h
security/sandbox/win/src/target_interceptions.cc
security/sandbox/win/src/target_interceptions.h
security/sandbox/win/src/target_process.cc
security/sandbox/win/src/target_process.h
security/sandbox/win/src/target_services.cc
security/sandbox/win/src/target_services.h
security/sandbox/win/src/threadpool_unittest.cc
security/sandbox/win/src/unload_dll_test.cc
security/sandbox/win/src/win2k_threadpool.cc
security/sandbox/win/src/win2k_threadpool.h
security/sandbox/win/src/win_utils.cc
security/sandbox/win/src/win_utils.h
security/sandbox/win/src/win_utils_unittest.cc
security/sandbox/win/src/window.cc
security/sandbox/win/src/window.h
deleted file mode 100644
--- a/security/sandbox/chromium-shim/base/strings/string_piece.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECURITY_SANDBOX_SHIM_BASE_STRING_PIECE_H
-#define _SECURITY_SANDBOX_SHIM_BASE_STRING_PIECE_H
-#include "sandbox/chromium/base/strings/string_piece.h"
-
-namespace {
-bool IsStringASCII(const base::StringPiece& ascii)
-{
-  return IsStringASCII(ascii.as_string());
-}
-}
-#endif
rename from security/sandbox/win/src/Wow64.cc
rename to security/sandbox/chromium/sandbox/win/src/Wow64.cc
rename from security/sandbox/win/src/Wow64.h
rename to security/sandbox/chromium/sandbox/win/src/Wow64.h
rename from security/sandbox/win/src/Wow64_64.cc
rename to security/sandbox/chromium/sandbox/win/src/Wow64_64.cc
rename from security/sandbox/win/src/acl.cc
rename to security/sandbox/chromium/sandbox/win/src/acl.cc
rename from security/sandbox/win/src/acl.h
rename to security/sandbox/chromium/sandbox/win/src/acl.h
rename from security/sandbox/win/src/app_container.cc
rename to security/sandbox/chromium/sandbox/win/src/app_container.cc
rename from security/sandbox/win/src/app_container.h
rename to security/sandbox/chromium/sandbox/win/src/app_container.h
rename from security/sandbox/win/src/app_container_test.cc
rename to security/sandbox/chromium/sandbox/win/src/app_container_test.cc
rename from security/sandbox/win/src/app_container_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/app_container_unittest.cc
rename from security/sandbox/win/src/broker_services.cc
rename to security/sandbox/chromium/sandbox/win/src/broker_services.cc
rename from security/sandbox/win/src/broker_services.h
rename to security/sandbox/chromium/sandbox/win/src/broker_services.h
rename from security/sandbox/win/src/crosscall_client.h
rename to security/sandbox/chromium/sandbox/win/src/crosscall_client.h
rename from security/sandbox/win/src/crosscall_params.h
rename to security/sandbox/chromium/sandbox/win/src/crosscall_params.h
rename from security/sandbox/win/src/crosscall_server.cc
rename to security/sandbox/chromium/sandbox/win/src/crosscall_server.cc
rename from security/sandbox/win/src/crosscall_server.h
rename to security/sandbox/chromium/sandbox/win/src/crosscall_server.h
rename from security/sandbox/win/src/eat_resolver.cc
rename to security/sandbox/chromium/sandbox/win/src/eat_resolver.cc
rename from security/sandbox/win/src/eat_resolver.h
rename to security/sandbox/chromium/sandbox/win/src/eat_resolver.h
rename from security/sandbox/win/src/file_policy_test.cc
rename to security/sandbox/chromium/sandbox/win/src/file_policy_test.cc
rename from security/sandbox/win/src/filesystem_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/filesystem_dispatcher.cc
rename from security/sandbox/win/src/filesystem_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/filesystem_dispatcher.h
rename from security/sandbox/win/src/filesystem_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/filesystem_interception.cc
rename from security/sandbox/win/src/filesystem_interception.h
rename to security/sandbox/chromium/sandbox/win/src/filesystem_interception.h
rename from security/sandbox/win/src/filesystem_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/filesystem_policy.cc
rename from security/sandbox/win/src/filesystem_policy.h
rename to security/sandbox/chromium/sandbox/win/src/filesystem_policy.h
rename from security/sandbox/win/src/handle_closer.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_closer.cc
rename from security/sandbox/win/src/handle_closer.h
rename to security/sandbox/chromium/sandbox/win/src/handle_closer.h
rename from security/sandbox/win/src/handle_closer_agent.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_closer_agent.cc
rename from security/sandbox/win/src/handle_closer_agent.h
rename to security/sandbox/chromium/sandbox/win/src/handle_closer_agent.h
rename from security/sandbox/win/src/handle_closer_test.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_closer_test.cc
rename from security/sandbox/win/src/handle_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_dispatcher.cc
rename from security/sandbox/win/src/handle_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/handle_dispatcher.h
rename from security/sandbox/win/src/handle_inheritance_test.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_inheritance_test.cc
rename from security/sandbox/win/src/handle_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_interception.cc
rename from security/sandbox/win/src/handle_interception.h
rename to security/sandbox/chromium/sandbox/win/src/handle_interception.h
rename from security/sandbox/win/src/handle_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_policy.cc
rename from security/sandbox/win/src/handle_policy.h
rename to security/sandbox/chromium/sandbox/win/src/handle_policy.h
rename from security/sandbox/win/src/handle_policy_test.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_policy_test.cc
rename from security/sandbox/win/src/handle_table.cc
rename to security/sandbox/chromium/sandbox/win/src/handle_table.cc
rename from security/sandbox/win/src/handle_table.h
rename to security/sandbox/chromium/sandbox/win/src/handle_table.h
rename from security/sandbox/win/src/integrity_level_test.cc
rename to security/sandbox/chromium/sandbox/win/src/integrity_level_test.cc
rename from security/sandbox/win/src/interception.cc
rename to security/sandbox/chromium/sandbox/win/src/interception.cc
rename from security/sandbox/win/src/interception.h
rename to security/sandbox/chromium/sandbox/win/src/interception.h
rename from security/sandbox/win/src/interception_agent.cc
rename to security/sandbox/chromium/sandbox/win/src/interception_agent.cc
rename from security/sandbox/win/src/interception_agent.h
rename to security/sandbox/chromium/sandbox/win/src/interception_agent.h
rename from security/sandbox/win/src/interception_internal.h
rename to security/sandbox/chromium/sandbox/win/src/interception_internal.h
rename from security/sandbox/win/src/interception_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/interception_unittest.cc
rename from security/sandbox/win/src/interceptors.h
rename to security/sandbox/chromium/sandbox/win/src/interceptors.h
rename from security/sandbox/win/src/interceptors_64.cc
rename to security/sandbox/chromium/sandbox/win/src/interceptors_64.cc
rename from security/sandbox/win/src/interceptors_64.h
rename to security/sandbox/chromium/sandbox/win/src/interceptors_64.h
rename from security/sandbox/win/src/internal_types.h
rename to security/sandbox/chromium/sandbox/win/src/internal_types.h
rename from security/sandbox/win/src/ipc_ping_test.cc
rename to security/sandbox/chromium/sandbox/win/src/ipc_ping_test.cc
rename from security/sandbox/win/src/ipc_tags.h
rename to security/sandbox/chromium/sandbox/win/src/ipc_tags.h
rename from security/sandbox/win/src/ipc_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/ipc_unittest.cc
rename from security/sandbox/win/src/job.cc
rename to security/sandbox/chromium/sandbox/win/src/job.cc
rename from security/sandbox/win/src/job.h
rename to security/sandbox/chromium/sandbox/win/src/job.h
rename from security/sandbox/win/src/job_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/job_unittest.cc
rename from security/sandbox/win/src/named_pipe_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_dispatcher.cc
rename from security/sandbox/win/src/named_pipe_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_dispatcher.h
rename from security/sandbox/win/src/named_pipe_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_interception.cc
rename from security/sandbox/win/src/named_pipe_interception.h
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_interception.h
rename from security/sandbox/win/src/named_pipe_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_policy.cc
rename from security/sandbox/win/src/named_pipe_policy.h
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_policy.h
rename from security/sandbox/win/src/named_pipe_policy_test.cc
rename to security/sandbox/chromium/sandbox/win/src/named_pipe_policy_test.cc
rename from security/sandbox/win/src/nt_internals.h
rename to security/sandbox/chromium/sandbox/win/src/nt_internals.h
rename from security/sandbox/win/src/policy_broker.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_broker.cc
rename from security/sandbox/win/src/policy_broker.h
rename to security/sandbox/chromium/sandbox/win/src/policy_broker.h
rename from security/sandbox/win/src/policy_engine_opcodes.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_engine_opcodes.cc
rename from security/sandbox/win/src/policy_engine_opcodes.h
rename to security/sandbox/chromium/sandbox/win/src/policy_engine_opcodes.h
rename from security/sandbox/win/src/policy_engine_params.h
rename to security/sandbox/chromium/sandbox/win/src/policy_engine_params.h
rename from security/sandbox/win/src/policy_engine_processor.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_engine_processor.cc
rename from security/sandbox/win/src/policy_engine_processor.h
rename to security/sandbox/chromium/sandbox/win/src/policy_engine_processor.h
rename from security/sandbox/win/src/policy_engine_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_engine_unittest.cc
rename from security/sandbox/win/src/policy_low_level.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_low_level.cc
rename from security/sandbox/win/src/policy_low_level.h
rename to security/sandbox/chromium/sandbox/win/src/policy_low_level.h
rename from security/sandbox/win/src/policy_low_level_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_low_level_unittest.cc
rename from security/sandbox/win/src/policy_opcodes_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_opcodes_unittest.cc
rename from security/sandbox/win/src/policy_params.h
rename to security/sandbox/chromium/sandbox/win/src/policy_params.h
rename from security/sandbox/win/src/policy_target.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_target.cc
rename from security/sandbox/win/src/policy_target.h
rename to security/sandbox/chromium/sandbox/win/src/policy_target.h
rename from security/sandbox/win/src/policy_target_test.cc
rename to security/sandbox/chromium/sandbox/win/src/policy_target_test.cc
rename from security/sandbox/win/src/process_mitigations.cc
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
rename from security/sandbox/win/src/process_mitigations.h
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations.h
rename from security/sandbox/win/src/process_mitigations_test.cc
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_test.cc
rename from security/sandbox/win/src/process_mitigations_win32k_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_dispatcher.cc
rename from security/sandbox/win/src/process_mitigations_win32k_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_dispatcher.h
rename from security/sandbox/win/src/process_mitigations_win32k_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_interception.cc
rename from security/sandbox/win/src/process_mitigations_win32k_interception.h
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_interception.h
rename from security/sandbox/win/src/process_mitigations_win32k_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_policy.cc
rename from security/sandbox/win/src/process_mitigations_win32k_policy.h
rename to security/sandbox/chromium/sandbox/win/src/process_mitigations_win32k_policy.h
rename from security/sandbox/win/src/process_policy_test.cc
rename to security/sandbox/chromium/sandbox/win/src/process_policy_test.cc
rename from security/sandbox/win/src/process_thread_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/process_thread_dispatcher.cc
rename from security/sandbox/win/src/process_thread_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/process_thread_dispatcher.h
rename from security/sandbox/win/src/process_thread_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/process_thread_interception.cc
rename from security/sandbox/win/src/process_thread_interception.h
rename to security/sandbox/chromium/sandbox/win/src/process_thread_interception.h
rename from security/sandbox/win/src/process_thread_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/process_thread_policy.cc
rename from security/sandbox/win/src/process_thread_policy.h
rename to security/sandbox/chromium/sandbox/win/src/process_thread_policy.h
rename from security/sandbox/win/src/registry_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/registry_dispatcher.cc
rename from security/sandbox/win/src/registry_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/registry_dispatcher.h
rename from security/sandbox/win/src/registry_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/registry_interception.cc
rename from security/sandbox/win/src/registry_interception.h
rename to security/sandbox/chromium/sandbox/win/src/registry_interception.h
rename from security/sandbox/win/src/registry_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/registry_policy.cc
rename from security/sandbox/win/src/registry_policy.h
rename to security/sandbox/chromium/sandbox/win/src/registry_policy.h
rename from security/sandbox/win/src/registry_policy_test.cc
rename to security/sandbox/chromium/sandbox/win/src/registry_policy_test.cc
rename from security/sandbox/win/src/resolver.cc
rename to security/sandbox/chromium/sandbox/win/src/resolver.cc
rename from security/sandbox/win/src/resolver.h
rename to security/sandbox/chromium/sandbox/win/src/resolver.h
rename from security/sandbox/win/src/resolver_32.cc
rename to security/sandbox/chromium/sandbox/win/src/resolver_32.cc
rename from security/sandbox/win/src/resolver_64.cc
rename to security/sandbox/chromium/sandbox/win/src/resolver_64.cc
rename from security/sandbox/win/src/restricted_token.cc
rename to security/sandbox/chromium/sandbox/win/src/restricted_token.cc
rename from security/sandbox/win/src/restricted_token.h
rename to security/sandbox/chromium/sandbox/win/src/restricted_token.h
rename from security/sandbox/win/src/restricted_token_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/restricted_token_unittest.cc
rename from security/sandbox/win/src/restricted_token_utils.cc
rename to security/sandbox/chromium/sandbox/win/src/restricted_token_utils.cc
rename from security/sandbox/win/src/restricted_token_utils.h
rename to security/sandbox/chromium/sandbox/win/src/restricted_token_utils.h
rename from security/sandbox/win/src/sandbox.cc
rename to security/sandbox/chromium/sandbox/win/src/sandbox.cc
rename from security/sandbox/win/src/sandbox.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox.h
rename from security/sandbox/win/src/sandbox.vcproj
rename to security/sandbox/chromium/sandbox/win/src/sandbox.vcproj
rename from security/sandbox/win/src/sandbox_factory.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_factory.h
rename from security/sandbox/win/src/sandbox_globals.cc
rename to security/sandbox/chromium/sandbox/win/src/sandbox_globals.cc
rename from security/sandbox/win/src/sandbox_nt_types.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_nt_types.h
rename from security/sandbox/win/src/sandbox_nt_util.cc
rename to security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.cc
rename from security/sandbox/win/src/sandbox_nt_util.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.h
rename from security/sandbox/win/src/sandbox_policy.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
rename from security/sandbox/win/src/sandbox_policy_base.cc
rename to security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.cc
rename from security/sandbox/win/src/sandbox_policy_base.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.h
rename from security/sandbox/win/src/sandbox_types.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_types.h
rename from security/sandbox/win/src/sandbox_utils.cc
rename to security/sandbox/chromium/sandbox/win/src/sandbox_utils.cc
rename from security/sandbox/win/src/sandbox_utils.h
rename to security/sandbox/chromium/sandbox/win/src/sandbox_utils.h
rename from security/sandbox/win/src/security_level.h
rename to security/sandbox/chromium/sandbox/win/src/security_level.h
rename from security/sandbox/win/src/service_resolver.cc
rename to security/sandbox/chromium/sandbox/win/src/service_resolver.cc
rename from security/sandbox/win/src/service_resolver.h
rename to security/sandbox/chromium/sandbox/win/src/service_resolver.h
rename from security/sandbox/win/src/service_resolver_32.cc
rename to security/sandbox/chromium/sandbox/win/src/service_resolver_32.cc
rename from security/sandbox/win/src/service_resolver_64.cc
rename to security/sandbox/chromium/sandbox/win/src/service_resolver_64.cc
rename from security/sandbox/win/src/service_resolver_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/service_resolver_unittest.cc
rename from security/sandbox/win/src/shared_handles.cc
rename to security/sandbox/chromium/sandbox/win/src/shared_handles.cc
rename from security/sandbox/win/src/shared_handles.h
rename to security/sandbox/chromium/sandbox/win/src/shared_handles.h
rename from security/sandbox/win/src/sharedmem_ipc_client.cc
rename to security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.cc
rename from security/sandbox/win/src/sharedmem_ipc_client.h
rename to security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.h
rename from security/sandbox/win/src/sharedmem_ipc_server.cc
rename to security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_server.cc
rename from security/sandbox/win/src/sharedmem_ipc_server.h
rename to security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_server.h
rename from security/sandbox/win/src/sid.cc
rename to security/sandbox/chromium/sandbox/win/src/sid.cc
rename from security/sandbox/win/src/sid.h
rename to security/sandbox/chromium/sandbox/win/src/sid.h
rename from security/sandbox/win/src/sid_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/sid_unittest.cc
rename from security/sandbox/win/src/sidestep/ia32_modrm_map.cpp
rename to security/sandbox/chromium/sandbox/win/src/sidestep/ia32_modrm_map.cpp
rename from security/sandbox/win/src/sidestep/ia32_opcode_map.cpp
rename to security/sandbox/chromium/sandbox/win/src/sidestep/ia32_opcode_map.cpp
rename from security/sandbox/win/src/sidestep/mini_disassembler.cpp
rename to security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler.cpp
rename from security/sandbox/win/src/sidestep/mini_disassembler.h
rename to security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler.h
rename from security/sandbox/win/src/sidestep/mini_disassembler_types.h
rename to security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler_types.h
rename from security/sandbox/win/src/sidestep/preamble_patcher.h
rename to security/sandbox/chromium/sandbox/win/src/sidestep/preamble_patcher.h
rename from security/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp
rename to security/sandbox/chromium/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp
rename from security/sandbox/win/src/sidestep_resolver.cc
rename to security/sandbox/chromium/sandbox/win/src/sidestep_resolver.cc
rename from security/sandbox/win/src/sidestep_resolver.h
rename to security/sandbox/chromium/sandbox/win/src/sidestep_resolver.h
rename from security/sandbox/win/src/sync_dispatcher.cc
rename to security/sandbox/chromium/sandbox/win/src/sync_dispatcher.cc
rename from security/sandbox/win/src/sync_dispatcher.h
rename to security/sandbox/chromium/sandbox/win/src/sync_dispatcher.h
rename from security/sandbox/win/src/sync_interception.cc
rename to security/sandbox/chromium/sandbox/win/src/sync_interception.cc
rename from security/sandbox/win/src/sync_interception.h
rename to security/sandbox/chromium/sandbox/win/src/sync_interception.h
rename from security/sandbox/win/src/sync_policy.cc
rename to security/sandbox/chromium/sandbox/win/src/sync_policy.cc
rename from security/sandbox/win/src/sync_policy.h
rename to security/sandbox/chromium/sandbox/win/src/sync_policy.h
rename from security/sandbox/win/src/sync_policy_test.cc
rename to security/sandbox/chromium/sandbox/win/src/sync_policy_test.cc
rename from security/sandbox/win/src/sync_policy_test.h
rename to security/sandbox/chromium/sandbox/win/src/sync_policy_test.h
rename from security/sandbox/win/src/target_interceptions.cc
rename to security/sandbox/chromium/sandbox/win/src/target_interceptions.cc
rename from security/sandbox/win/src/target_interceptions.h
rename to security/sandbox/chromium/sandbox/win/src/target_interceptions.h
rename from security/sandbox/win/src/target_process.cc
rename to security/sandbox/chromium/sandbox/win/src/target_process.cc
rename from security/sandbox/win/src/target_process.h
rename to security/sandbox/chromium/sandbox/win/src/target_process.h
rename from security/sandbox/win/src/target_services.cc
rename to security/sandbox/chromium/sandbox/win/src/target_services.cc
rename from security/sandbox/win/src/target_services.h
rename to security/sandbox/chromium/sandbox/win/src/target_services.h
rename from security/sandbox/win/src/threadpool_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/threadpool_unittest.cc
rename from security/sandbox/win/src/unload_dll_test.cc
rename to security/sandbox/chromium/sandbox/win/src/unload_dll_test.cc
rename from security/sandbox/win/src/win2k_threadpool.cc
rename to security/sandbox/chromium/sandbox/win/src/win2k_threadpool.cc
rename from security/sandbox/win/src/win2k_threadpool.h
rename to security/sandbox/chromium/sandbox/win/src/win2k_threadpool.h
rename from security/sandbox/win/src/win_utils.cc
rename to security/sandbox/chromium/sandbox/win/src/win_utils.cc
rename from security/sandbox/win/src/win_utils.h
rename to security/sandbox/chromium/sandbox/win/src/win_utils.h
rename from security/sandbox/win/src/win_utils_unittest.cc
rename to security/sandbox/chromium/sandbox/win/src/win_utils_unittest.cc
rename from security/sandbox/win/src/window.cc
rename to security/sandbox/chromium/sandbox/win/src/window.cc
rename from security/sandbox/win/src/window.h
rename to security/sandbox/chromium/sandbox/win/src/window.h
--- a/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
+++ b/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
@@ -1,8 +1,10 @@
 Please add a link to the bugzilla bug and patch name that should be re-applied.
 Also, please update any existing links to their actual mozilla-central changeset.
+Note: security/sandbox/win/src has moved to security/sandbox/chromium/sandbox/win/src
 
 https://hg.mozilla.org/mozilla-central/rev/365d1073111a
 https://hg.mozilla.org/mozilla-central/rev/0f763c186855
 https://hg.mozilla.org/mozilla-central/rev/d58c0218bb55
-https://bugzilla.mozilla.org/show_bug.cgi?id=1119072 (Part 3) vs2015-hashset-hashmap.patch
-https://bugzilla.mozilla.org/show_bug.cgi?id=1119072 (Part 6) vs2015-change-const-to-non-const-element.patch
+https://hg.mozilla.org/mozilla-central/rev/e139be9249f2
+https://hg.mozilla.org/mozilla-central/rev/c827c112df81
+https://hg.mozilla.org/mozilla-central/rev/7df8d6639971
--- a/security/sandbox/moz-chromium-commit-status.txt
+++ b/security/sandbox/moz-chromium-commit-status.txt
@@ -1,6 +1,5 @@
 Chromium Commit                            Directory / File (relative to security/sandbox/)
 ----------------------------------------   ------------------------------------------------
 9522fad406dd161400daa518075828e47bd47f60   chromium
 8e2be8d727b46e1f6f1694786dc2161b11146bd4   chromium/base/compiler_specific.h
                                            (Note: above is to keep MSVC2010 support.)
-9522fad406dd161400daa518075828e47bd47f60   win
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -28,25 +28,24 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
         'chromium-shim/sandbox/win/sandboxLogging.h',
     ]
 
     include('objs.mozbuild')
     SOURCES += security_sandbox_cppsrcs
 
     # Bug 1102853 tracks looking at removing this.
     if CONFIG['CPU_ARCH'] == 'x86_64':
-        SOURCES['%s/security/sandbox/win/src/sharedmem_ipc_client.cc' % TOPSRCDIR].no_pgo = True
+        SOURCES['%s/security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.cc' % TOPSRCDIR].no_pgo = True
 
     for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
                 'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
     LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
     LOCAL_INCLUDES += ['/security/sandbox/chromium']
-    LOCAL_INCLUDES += ['/security']
     LOCAL_INCLUDES += ['/nsprpub']
 
     DISABLE_STL_WRAPPING = True
 
     # Suppress warnings in third-party code.
     if CONFIG['_MSC_VER']:
         CXXFLAGS += [
             '-wd4275', # non dll-interface class exception used as base for dll-interface class
--- a/security/sandbox/objs.mozbuild
+++ b/security/sandbox/objs.mozbuild
@@ -39,90 +39,90 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'chromium/base/threading/thread_restrictions.cc',
         'chromium/base/time/time.cc',
         'chromium/base/time/time_win.cc',
         'chromium/base/win/pe_image.cc',
         'chromium/base/win/scoped_handle.cc',
         'chromium/base/win/scoped_process_information.cc',
         'chromium/base/win/startup_information.cc',
         'chromium/base/win/windows_version.cc',
-        'win/src/acl.cc',
-        'win/src/app_container.cc',
-        'win/src/broker_services.cc',
-        'win/src/crosscall_server.cc',
-        'win/src/eat_resolver.cc',
-        'win/src/filesystem_dispatcher.cc',
-        'win/src/filesystem_interception.cc',
-        'win/src/filesystem_policy.cc',
-        'win/src/handle_closer.cc',
-        'win/src/handle_closer_agent.cc',
-        'win/src/handle_dispatcher.cc',
-        'win/src/handle_interception.cc',
-        'win/src/handle_policy.cc',
-        'win/src/handle_table.cc',
-        'win/src/interception.cc',
-        'win/src/interception_agent.cc',
-        'win/src/job.cc',
-        'win/src/named_pipe_dispatcher.cc',
-        'win/src/named_pipe_interception.cc',
-        'win/src/named_pipe_policy.cc',
-        'win/src/policy_broker.cc',
-        'win/src/policy_engine_opcodes.cc',
-        'win/src/policy_engine_processor.cc',
-        'win/src/policy_low_level.cc',
-        'win/src/policy_target.cc',
-        'win/src/process_mitigations.cc',
-        'win/src/process_mitigations_win32k_dispatcher.cc',
-        'win/src/process_mitigations_win32k_interception.cc',
-        'win/src/process_mitigations_win32k_policy.cc',
-        'win/src/process_thread_dispatcher.cc',
-        'win/src/process_thread_interception.cc',
-        'win/src/process_thread_policy.cc',
-        'win/src/registry_dispatcher.cc',
-        'win/src/registry_interception.cc',
-        'win/src/registry_policy.cc',
-        'win/src/resolver.cc',
-        'win/src/restricted_token.cc',
-        'win/src/restricted_token_utils.cc',
-        'win/src/sandbox.cc',
-        'win/src/sandbox_globals.cc',
-        'win/src/sandbox_nt_util.cc',
-        'win/src/sandbox_policy_base.cc',
-        'win/src/sandbox_utils.cc',
-        'win/src/service_resolver.cc',
-        'win/src/shared_handles.cc',
-        'win/src/sharedmem_ipc_client.cc',
-        'win/src/sharedmem_ipc_server.cc',
-        'win/src/sid.cc',
-        'win/src/sync_dispatcher.cc',
-        'win/src/sync_interception.cc',
-        'win/src/sync_policy.cc',
-        'win/src/target_interceptions.cc',
-        'win/src/target_process.cc',
-        'win/src/target_services.cc',
-        'win/src/win2k_threadpool.cc',
-        'win/src/win_utils.cc',
-        'win/src/window.cc',
+        'chromium/sandbox/win/src/acl.cc',
+        'chromium/sandbox/win/src/app_container.cc',
+        'chromium/sandbox/win/src/broker_services.cc',
+        'chromium/sandbox/win/src/crosscall_server.cc',
+        'chromium/sandbox/win/src/eat_resolver.cc',
+        'chromium/sandbox/win/src/filesystem_dispatcher.cc',
+        'chromium/sandbox/win/src/filesystem_interception.cc',
+        'chromium/sandbox/win/src/filesystem_policy.cc',
+        'chromium/sandbox/win/src/handle_closer.cc',
+        'chromium/sandbox/win/src/handle_closer_agent.cc',
+        'chromium/sandbox/win/src/handle_dispatcher.cc',
+        'chromium/sandbox/win/src/handle_interception.cc',
+        'chromium/sandbox/win/src/handle_policy.cc',
+        'chromium/sandbox/win/src/handle_table.cc',
+        'chromium/sandbox/win/src/interception.cc',
+        'chromium/sandbox/win/src/interception_agent.cc',
+        'chromium/sandbox/win/src/job.cc',
+        'chromium/sandbox/win/src/named_pipe_dispatcher.cc',
+        'chromium/sandbox/win/src/named_pipe_interception.cc',
+        'chromium/sandbox/win/src/named_pipe_policy.cc',
+        'chromium/sandbox/win/src/policy_broker.cc',
+        'chromium/sandbox/win/src/policy_engine_opcodes.cc',
+        'chromium/sandbox/win/src/policy_engine_processor.cc',
+        'chromium/sandbox/win/src/policy_low_level.cc',
+        'chromium/sandbox/win/src/policy_target.cc',
+        'chromium/sandbox/win/src/process_mitigations.cc',
+        'chromium/sandbox/win/src/process_mitigations_win32k_dispatcher.cc',
+        'chromium/sandbox/win/src/process_mitigations_win32k_interception.cc',
+        'chromium/sandbox/win/src/process_mitigations_win32k_policy.cc',
+        'chromium/sandbox/win/src/process_thread_dispatcher.cc',
+        'chromium/sandbox/win/src/process_thread_interception.cc',
+        'chromium/sandbox/win/src/process_thread_policy.cc',
+        'chromium/sandbox/win/src/registry_dispatcher.cc',
+        'chromium/sandbox/win/src/registry_interception.cc',
+        'chromium/sandbox/win/src/registry_policy.cc',
+        'chromium/sandbox/win/src/resolver.cc',
+        'chromium/sandbox/win/src/restricted_token.cc',
+        'chromium/sandbox/win/src/restricted_token_utils.cc',
+        'chromium/sandbox/win/src/sandbox.cc',
+        'chromium/sandbox/win/src/sandbox_globals.cc',
+        'chromium/sandbox/win/src/sandbox_nt_util.cc',
+        'chromium/sandbox/win/src/sandbox_policy_base.cc',
+        'chromium/sandbox/win/src/sandbox_utils.cc',
+        'chromium/sandbox/win/src/service_resolver.cc',
+        'chromium/sandbox/win/src/shared_handles.cc',
+        'chromium/sandbox/win/src/sharedmem_ipc_client.cc',
+        'chromium/sandbox/win/src/sharedmem_ipc_server.cc',
+        'chromium/sandbox/win/src/sid.cc',
+        'chromium/sandbox/win/src/sync_dispatcher.cc',
+        'chromium/sandbox/win/src/sync_interception.cc',
+        'chromium/sandbox/win/src/sync_policy.cc',
+        'chromium/sandbox/win/src/target_interceptions.cc',
+        'chromium/sandbox/win/src/target_process.cc',
+        'chromium/sandbox/win/src/target_services.cc',
+        'chromium/sandbox/win/src/win2k_threadpool.cc',
+        'chromium/sandbox/win/src/win_utils.cc',
+        'chromium/sandbox/win/src/window.cc',
     ]
 
     if CONFIG['CPU_ARCH'] == 'x86_64':
         security_sandbox_lcppsrcs += [
-            'win/src/interceptors_64.cc',
-            'win/src/resolver_64.cc',
-            'win/src/service_resolver_64.cc',
-            'win/src/Wow64_64.cc',
+            'chromium/sandbox/win/src/interceptors_64.cc',
+            'chromium/sandbox/win/src/resolver_64.cc',
+            'chromium/sandbox/win/src/service_resolver_64.cc',
+            'chromium/sandbox/win/src/Wow64_64.cc',
         ]
     else:
         security_sandbox_lcppsrcs += [
-            'win/src/resolver_32.cc',
-            'win/src/service_resolver_32.cc',
-            'win/src/sidestep/ia32_modrm_map.cpp',
-            'win/src/sidestep/ia32_opcode_map.cpp',
-            'win/src/sidestep/mini_disassembler.cpp',
-            'win/src/sidestep/preamble_patcher_with_stub.cpp',
-            'win/src/sidestep_resolver.cc',
-            'win/src/Wow64.cc',
+            'chromium/sandbox/win/src/resolver_32.cc',
+            'chromium/sandbox/win/src/service_resolver_32.cc',
+            'chromium/sandbox/win/src/sidestep/ia32_modrm_map.cpp',
+            'chromium/sandbox/win/src/sidestep/ia32_opcode_map.cpp',
+            'chromium/sandbox/win/src/sidestep/mini_disassembler.cpp',
+            'chromium/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp',
+            'chromium/sandbox/win/src/sidestep_resolver.cc',
+            'chromium/sandbox/win/src/Wow64.cc',
         ]
 
     security_sandbox_cppsrcs = [
         '%s/security/sandbox/%s' % (TOPSRCDIR, s)
             for s in sorted(security_sandbox_lcppsrcs)
     ]
--- a/security/sandbox/staticruntime/moz.build
+++ b/security/sandbox/staticruntime/moz.build
@@ -9,25 +9,24 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     FORCE_STATIC_LIB = True
     USE_STATIC_LIBS = True
 
     include('../objs.mozbuild')
     SOURCES += security_sandbox_cppsrcs
 
     # Bug 1102853 tracks looking at removing this.
     if CONFIG['CPU_ARCH'] == 'x86_64':
-        SOURCES['%s/security/sandbox/win/src/sharedmem_ipc_client.cc' % TOPSRCDIR].no_pgo = True
+        SOURCES['%s/security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.cc' % TOPSRCDIR].no_pgo = True
 
     for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
                 'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
     LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
     LOCAL_INCLUDES += ['/security/sandbox/chromium']
-    LOCAL_INCLUDES += ['/security']
     LOCAL_INCLUDES += ['/nsprpub']
 
     DISABLE_STL_WRAPPING = True
 
     # Suppress warnings in third-party code.
     if CONFIG['_MSC_VER']:
         CXXFLAGS += [
             '-wd4275', # non dll-interface class exception used as base for dll-interface class
deleted file mode 100644
--- a/security/sandbox/win/src/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@@ -19,17 +19,16 @@ EXPORTS += [
     'sandboxBroker.h',
 ]
 
 for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'NOMINMAX',
             'SANDBOX_EXPORTS'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [
-    '/security',
     '/security/sandbox/chromium',
 ]
 
 DISABLE_STL_WRAPPING = True
 
 OS_LIBS += [
     'dbghelp',
 ]