--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -52,13 +52,13 @@
 
 /*
  * Force-include sdkdecls.h for building the chromium sandbox code.
  *
  * CHROMIUM_SANDBOX_BUILD is defined in security/sandbox/moz.build.
  * Note that this include path relies on the LOCAL_INCLUDES in that file.
  */
 #if defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN)
-#include "base/shim/sdkdecls.h"
+#include "base/win/sdkdecls.h"
 #endif
 
 #endif /* _MOZILLA_CONFIG_H_ */
 

rename from security/sandbox/chromium/base/shim/base/gtest_prod_util.h
rename to security/sandbox/chromium-shim/base/gtest_prod_util.h

rename from security/sandbox/chromium/base/shim/base/logging.cpp
rename to security/sandbox/chromium-shim/base/logging.cpp

rename from security/sandbox/chromium/base/shim/base/strings/string_piece.h
rename to security/sandbox/chromium-shim/base/strings/string_piece.h

rename from security/sandbox/chromium/base/shim/base/third_party/nspr/prtime.h
rename to security/sandbox/chromium-shim/base/third_party/nspr/prtime.h

rename from security/sandbox/chromium/base/shim/base/third_party/nspr/prtypes.h
rename to security/sandbox/chromium-shim/base/third_party/nspr/prtypes.h

rename from security/sandbox/chromium/base/shim/base/threading/thread_local_storage.h
rename to security/sandbox/chromium-shim/base/threading/thread_local_storage.h

rename from security/sandbox/chromium/base/shim/base/tracked_objects.h
rename to security/sandbox/chromium-shim/base/tracked_objects.h

rename from security/sandbox/chromium/base/shim/base/win/registry.h
rename to security/sandbox/chromium-shim/base/win/registry.h

rename from security/sandbox/chromium/base/shim/sdkdecls.h
rename to security/sandbox/chromium-shim/base/win/sdkdecls.h

rename from security/sandbox/win/src/logging/loggingCallbacks.h
rename to security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h

rename from security/sandbox/win/src/logging/loggingTypes.h
rename to security/sandbox/chromium-shim/sandbox/win/loggingTypes.h

rename from security/sandbox/win/src/logging/sandboxLogging.cpp
rename to security/sandbox/chromium-shim/sandbox/win/sandboxLogging.cpp

rename from security/sandbox/win/src/logging/sandboxLogging.h
rename to security/sandbox/chromium-shim/sandbox/win/sandboxLogging.h

--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -14,17 +14,17 @@ if CONFIG['OS_TARGET'] == 'Android':
 else:
     Library('mozsandbox')
 
 EXPORTS.mozilla += [
     'Sandbox.h',
 ]
 
 SOURCES += [
-    '../chromium/base/shim/base/logging.cpp',
+    '../chromium-shim/base/logging.cpp',
     '../chromium/sandbox/linux/seccomp-bpf/basicblock.cc',
     '../chromium/sandbox/linux/seccomp-bpf/codegen.cc',
     '../chromium/sandbox/linux/seccomp-bpf/die.cc',
     '../chromium/sandbox/linux/seccomp-bpf/syscall.cc',
     'Sandbox.cpp',
     'SandboxAssembler.cpp',
     'SandboxFilter.cpp',
 ]
@@ -33,17 +33,17 @@ SOURCES += [
 # from the function using it which breaks the build.  Work around that by
 # forcing there to be only one partition.
 if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
     LDFLAGS += ['--param lto-partitions=1']
 
 DEFINES['NS_NO_XPCOM'] = True
 DISABLE_STL_WRAPPING = True
 
-LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
+LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
 LOCAL_INCLUDES += ['/security/sandbox/chromium']
 
 if CONFIG['OS_TARGET'] != 'Android':
     # Needed for clock_gettime with glibc < 2.17:
     OS_LIBS += [
         'rt',
     ]
 

--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -18,33 +18,33 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
         'win/src/sandboxtarget',
     ]
 
     if (CONFIG['CPU_ARCH'] == 'x86' and CONFIG['_MSC_VER'] and not
             CONFIG['CLANG_CL']):
         DIRS += ['win/wow_helper']
 
     EXPORTS.mozilla.sandboxing += [
-        'win/src/logging/loggingCallbacks.h',
-        'win/src/logging/loggingTypes.h',
-        'win/src/logging/sandboxLogging.h',
+        'chromium-shim/sandbox/win/loggingCallbacks.h',
+        'chromium-shim/sandbox/win/loggingTypes.h',
+        '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
 
     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/base/shim']
+    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']:

--- a/security/sandbox/objs.mozbuild
+++ b/security/sandbox/objs.mozbuild
@@ -1,27 +1,28 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     security_sandbox_lcppsrcs = [
+        'chromium-shim/base/logging.cpp',
+        'chromium-shim/sandbox/win/sandboxLogging.cpp',
         'chromium/base/at_exit.cc',
         'chromium/base/base_switches.cc',
         'chromium/base/callback_internal.cc',
         'chromium/base/cpu.cc',
         'chromium/base/debug/alias.cc',
         'chromium/base/debug/profiler.cc',
         'chromium/base/lazy_instance.cc',
         'chromium/base/location.cc',
         'chromium/base/memory/ref_counted.cc',
         'chromium/base/memory/singleton.cc',
-        'chromium/base/shim/base/logging.cpp',
         'chromium/base/strings/nullable_string16.cc',
         'chromium/base/strings/string_number_conversions.cc',
         'chromium/base/strings/string_piece.cc',
         'chromium/base/strings/string_split.cc',
         'chromium/base/strings/string_util.cc',
         'chromium/base/strings/string_util_constants.cc',
         'chromium/base/strings/stringprintf.cc',
         'chromium/base/strings/utf_string_conversion_utils.cc',
@@ -55,17 +56,16 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         '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/logging/sandboxLogging.cpp',
         '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',

--- a/security/sandbox/staticruntime/moz.build
+++ b/security/sandbox/staticruntime/moz.build
@@ -15,17 +15,17 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     # 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
 
     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/base/shim']
+    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']: