diff --git a/mozilla-config.h.in b/mozilla-config.h.in
index a8eb97d483d..6212581f517 100644
--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -57,7 +57,7 @@
  * Note that this include path relies on the LOCAL_INCLUDES in that file.
  */
 #if defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN)
-#include "base/win/sdkdecls.h"
+#include "base/shim/sdkdecls.h"
 #endif
 
 #endif /* _MOZILLA_CONFIG_H_ */
diff --git a/security/sandbox/chromium-shim/base/gtest_prod_util.h b/security/sandbox/chromium/base/shim/base/gtest_prod_util.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/gtest_prod_util.h
rename to security/sandbox/chromium/base/shim/base/gtest_prod_util.h
diff --git a/security/sandbox/chromium-shim/base/logging.cpp b/security/sandbox/chromium/base/shim/base/logging.cpp
similarity index 100%
rename from security/sandbox/chromium-shim/base/logging.cpp
rename to security/sandbox/chromium/base/shim/base/logging.cpp
diff --git a/security/sandbox/chromium-shim/base/strings/string_piece.h b/security/sandbox/chromium/base/shim/base/strings/string_piece.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/strings/string_piece.h
rename to security/sandbox/chromium/base/shim/base/strings/string_piece.h
diff --git a/security/sandbox/chromium-shim/base/third_party/nspr/prtime.h b/security/sandbox/chromium/base/shim/base/third_party/nspr/prtime.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/third_party/nspr/prtime.h
rename to security/sandbox/chromium/base/shim/base/third_party/nspr/prtime.h
diff --git a/security/sandbox/chromium-shim/base/third_party/nspr/prtypes.h b/security/sandbox/chromium/base/shim/base/third_party/nspr/prtypes.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/third_party/nspr/prtypes.h
rename to security/sandbox/chromium/base/shim/base/third_party/nspr/prtypes.h
diff --git a/security/sandbox/chromium-shim/base/threading/thread_local_storage.h b/security/sandbox/chromium/base/shim/base/threading/thread_local_storage.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/threading/thread_local_storage.h
rename to security/sandbox/chromium/base/shim/base/threading/thread_local_storage.h
diff --git a/security/sandbox/chromium-shim/base/tracked_objects.h b/security/sandbox/chromium/base/shim/base/tracked_objects.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/tracked_objects.h
rename to security/sandbox/chromium/base/shim/base/tracked_objects.h
diff --git a/security/sandbox/chromium-shim/base/win/registry.h b/security/sandbox/chromium/base/shim/base/win/registry.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/win/registry.h
rename to security/sandbox/chromium/base/shim/base/win/registry.h
diff --git a/security/sandbox/chromium-shim/base/win/sdkdecls.h b/security/sandbox/chromium/base/shim/sdkdecls.h
similarity index 100%
rename from security/sandbox/chromium-shim/base/win/sdkdecls.h
rename to security/sandbox/chromium/base/shim/sdkdecls.h
diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
index 2291c4e81d1..72af0098d40 100644
--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -19,7 +19,7 @@ EXPORTS.mozilla += [
 ]
 
 SOURCES += [
-    '../chromium-shim/base/logging.cpp',
+    '../chromium/base/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',
@@ -38,7 +38,7 @@ if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
 DEFINES['NS_NO_XPCOM'] = True
 DISABLE_STL_WRAPPING = True
 
-LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
+LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
 LOCAL_INCLUDES += ['/security/sandbox/chromium']
 
 if CONFIG['OS_TARGET'] != 'Android':
diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build
index c48c1107839..0482c09161f 100644
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -23,9 +23,9 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
         DIRS += ['win/wow_helper']
 
     EXPORTS.mozilla.sandboxing += [
-        'chromium-shim/sandbox/win/loggingCallbacks.h',
-        'chromium-shim/sandbox/win/loggingTypes.h',
-        'chromium-shim/sandbox/win/sandboxLogging.h',
+        'win/src/logging/loggingCallbacks.h',
+        'win/src/logging/loggingTypes.h',
+        'win/src/logging/sandboxLogging.h',
     ]
 
     include('objs.mozbuild')
@@ -39,7 +39,7 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
                 'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
-    LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
+    LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
     LOCAL_INCLUDES += ['/security/sandbox/chromium']
     LOCAL_INCLUDES += ['/security']
     LOCAL_INCLUDES += ['/nsprpub']
diff --git a/security/sandbox/objs.mozbuild b/security/sandbox/objs.mozbuild
index fde4b8b32d3..4db22ed7f8d 100644
--- a/security/sandbox/objs.mozbuild
+++ b/security/sandbox/objs.mozbuild
@@ -6,8 +6,6 @@
 
 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',
@@ -18,6 +16,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         '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',
@@ -61,6 +60,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         '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',
diff --git a/security/sandbox/staticruntime/moz.build b/security/sandbox/staticruntime/moz.build
index e7f9a42eade..e9516c286a5 100644
--- a/security/sandbox/staticruntime/moz.build
+++ b/security/sandbox/staticruntime/moz.build
@@ -20,7 +20,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
                 'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
-    LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
+    LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
     LOCAL_INCLUDES += ['/security/sandbox/chromium']
     LOCAL_INCLUDES += ['/security']
     LOCAL_INCLUDES += ['/nsprpub']
diff --git a/security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h b/security/sandbox/win/src/logging/loggingCallbacks.h
similarity index 100%
rename from security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h
rename to security/sandbox/win/src/logging/loggingCallbacks.h
diff --git a/security/sandbox/chromium-shim/sandbox/win/loggingTypes.h b/security/sandbox/win/src/logging/loggingTypes.h
similarity index 100%
rename from security/sandbox/chromium-shim/sandbox/win/loggingTypes.h
rename to security/sandbox/win/src/logging/loggingTypes.h
diff --git a/security/sandbox/chromium-shim/sandbox/win/sandboxLogging.cpp b/security/sandbox/win/src/logging/sandboxLogging.cpp
similarity index 100%
rename from security/sandbox/chromium-shim/sandbox/win/sandboxLogging.cpp
rename to security/sandbox/win/src/logging/sandboxLogging.cpp
diff --git a/security/sandbox/chromium-shim/sandbox/win/sandboxLogging.h b/security/sandbox/win/src/logging/sandboxLogging.h
similarity index 100%
rename from security/sandbox/chromium-shim/sandbox/win/sandboxLogging.h
rename to security/sandbox/win/src/logging/sandboxLogging.h