Emergency revert; rietveld broke; tree broke

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146646 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 25 insertions, 25 deletions

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 8094ca4..884eb11 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -37,7 +37,7 @@
 #include "crypto/nss_util.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/win/dpi.h"
diff --git a/content/app/startup_helper_win.cc b/content/app/startup_helper_win.cc
index 9ead36d..aaba83c 100644
--- a/content/app/startup_helper_win.cc
+++ b/content/app/startup_helper_win.cc
@@ -10,8 +10,8 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/dep.h"
-#include "sandbox/win/src/sandbox_factory.h"
+#include "sandbox/src/dep.h"
+#include "sandbox/src/sandbox_factory.h"
 
 namespace {
 
diff --git a/content/common/handle_enumerator_win.cc b/content/common/handle_enumerator_win.cc
index 424c55e..5f2dfbe 100644
--- a/content/common/handle_enumerator_win.cc
+++ b/content/common/handle_enumerator_win.cc
@@ -15,7 +15,7 @@
 #include "base/win/windows_version.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
-#include "sandbox/win/src/handle_table.h"
+#include "sandbox/src/handle_table.h"
 
 namespace {
 
diff --git a/content/common/sandbox_init_win.cc b/content/common/sandbox_init_win.cc
index a0eedcb..e2fe0b2 100644
--- a/content/common/sandbox_init_win.cc
+++ b/content/common/sandbox_init_win.cc
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "content/common/sandbox_policy.h"
 #include "content/public/common/content_switches.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace content {
 
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc
index 2878f2c..9c4efa1 100644
--- a/content/common/sandbox_policy.cc
+++ b/content/common/sandbox_policy.cc
@@ -25,9 +25,9 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/sandbox_init.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/win_utils.h"
 #include "ui/gl/gl_switches.h"
 
 static sandbox::BrokerServices* g_broker_services = NULL;
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 40d759c..6ab3247 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -30,7 +30,7 @@
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(USE_X11)
diff --git a/content/plugin/DEPS b/content/plugin/DEPS
index b8d10ee..6a3fdfa 100644
--- a/content/plugin/DEPS
+++ b/content/plugin/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "-chrome",
   "+content/public/plugin",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+skia/ext",
   "+third_party/npapi",
   "+webkit/glue",
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 67321cd..204fbe7 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -23,7 +23,7 @@
 
 #if defined(OS_WIN)
 #include "content/common/injection_test_dll.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/global_descriptors_posix.h"
 #include "ipc/ipc_descriptors.h"
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 4550e906..7f79f48 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -14,7 +14,7 @@
 #include "ppapi/proxy/proxy_module.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(OS_LINUX)
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 5fa3b87..c5d6e37 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -34,7 +34,7 @@
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #elif defined(OS_MACOSX)
 #include "content/common/sandbox_init_mac.h"
 #endif
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index 200133d..724cec9 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -13,7 +13,7 @@
 #include "content/common/injection_test_dll.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_thread.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #include "skia/ext/skia_sandbox_support_win.h"
 #include "unicode/timezone.h"
 
diff --git a/content/shell/shell_main.cc b/content/shell/shell_main.cc
index 62d6ea9..7e4eaf7 100644
--- a/content/shell/shell_main.cc
+++ b/content/shell/shell_main.cc
@@ -5,7 +5,7 @@
 #include "content/public/app/content_main.h"
 
 #include "content/shell/shell_main_delegate.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
diff --git a/content/test/browser_test_base.cc b/content/test/browser_test_base.cc
index a2f1b9a..8383be9 100644
--- a/content/test/browser_test_base.cc
+++ b/content/test/browser_test_base.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/public/common/main_function_params.h"
-#include "sandbox/win/src/dep.h"
+#include "sandbox/src/dep.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 2194cde..1e28b1d 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -16,7 +16,7 @@
 
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #endif  // defined(OS_WIN)
 
 class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
diff --git a/content/test/test_launcher.cc b/content/test/test_launcher.cc
index 62b1b4f..8c767cf 100644
--- a/content/test/test_launcher.cc
+++ b/content/test/test_launcher.cc
@@ -32,9 +32,9 @@
 #if defined(OS_WIN)
 #include "base/base_switches.h"
 #include "content/common/sandbox_policy.h"
-#include "sandbox/win/src/dep.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/dep.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_types.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
diff --git a/content/utility/DEPS b/content/utility/DEPS
index 7a77d69..bdee969 100644
--- a/content/utility/DEPS
+++ b/content/utility/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   "+content/public/utility",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+webkit/glue",
 ]
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc
index 711b7bc..dd7c571 100644
--- a/content/utility/utility_main.cc
+++ b/content/utility/utility_main.cc
@@ -13,7 +13,7 @@
 #include "content/utility/utility_thread_impl.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 // Mainline routine for running as the utility process.
diff --git a/content/worker/DEPS b/content/worker/DEPS
index ccf9e2b..ba093bb 100644
--- a/content/worker/DEPS
+++ b/content/worker/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+webkit/appcache",
   "+webkit/glue",
 ]
diff --git a/content/worker/worker_main.cc b/content/worker/worker_main.cc
index ff6a820..31b4c57 100644
--- a/content/worker/worker_main.cc
+++ b/content/worker/worker_main.cc
@@ -15,7 +15,7 @@
 #include "content/worker/worker_thread.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 // Mainline routine for running as the worker process.