diff options
| -rw-r--r-- | content/DEPS | 4 | ||||
| -rw-r--r-- | content/browser/DEPS | 6 | ||||
| -rw-r--r-- | content/browser/device_orientation/DEPS | 3 | ||||
| -rw-r--r-- | content/browser/in_process_webkit/indexed_db_unittest.cc | 2 | ||||
| -rw-r--r-- | content/common/gpu/DEPS | 1 | ||||
| -rw-r--r-- | content/gpu/DEPS | 2 | ||||
| -rw-r--r-- | content/ppapi_plugin/DEPS | 1 | ||||
| -rw-r--r-- | content/renderer/DEPS | 3 | ||||
| -rw-r--r-- | content/test/DEPS | 2 |
9 files changed, 3 insertions, 21 deletions
diff --git a/content/DEPS b/content/DEPS index 68599e0..b60e7f1 100644 --- a/content/DEPS +++ b/content/DEPS @@ -3,10 +3,6 @@ include_rules = [ "+crypto", - # Until we move most of our testing infrastructure in a way that content can - # make use of it. - "+chrome/test", - # The subdirectories in content/ will manually allow their own include # directories in content/ so we disallow all of them. "-content", diff --git a/content/browser/DEPS b/content/browser/DEPS index 495e626e3..063fc46 100644 --- a/content/browser/DEPS +++ b/content/browser/DEPS @@ -14,10 +14,4 @@ include_rules = [ # DO NOT ADD ANY CHROME INCLUDES HERE!!! # See https://sites.google.com/a/chromium.org/dev/developers/content-module # for more information. - - # ONLY USED BY TESTS - "+chrome/browser/ui/browser.h", - "+chrome/browser/ui/browser_commands.h", - "+chrome/browser/ui/browser_tabstrip.h", - "+chrome/browser/ui/singleton_tabs.h", ] diff --git a/content/browser/device_orientation/DEPS b/content/browser/device_orientation/DEPS index 3e195fe..e118614 100644 --- a/content/browser/device_orientation/DEPS +++ b/content/browser/device_orientation/DEPS @@ -1,6 +1,3 @@ include_rules = [ - "-chrome", - "+chrome/browser/ui", # for browser_test - "+chrome/test", # for browser_test "+third_party/sudden_motion_sensor", ] diff --git a/content/browser/in_process_webkit/indexed_db_unittest.cc b/content/browser/in_process_webkit/indexed_db_unittest.cc index 3bc51c1..23a4694 100644 --- a/content/browser/in_process_webkit/indexed_db_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_unittest.cc @@ -4,11 +4,11 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" -#include "chrome/test/base/ui_test_utils.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/in_process_webkit/indexed_db_context_impl.h" #include "content/public/common/url_constants.h" #include "content/public/test/test_browser_context.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webkit/database/database_util.h" #include "webkit/quota/mock_special_storage_policy.h" #include "webkit/quota/special_storage_policy.h" diff --git a/content/common/gpu/DEPS b/content/common/gpu/DEPS index ea89263..7e5f40b 100644 --- a/content/common/gpu/DEPS +++ b/content/common/gpu/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+chrome/app", "+gpu/command_buffer", "+libEGL", "+libGLESv2", diff --git a/content/gpu/DEPS b/content/gpu/DEPS index c1672fb..7e01f8c 100644 --- a/content/gpu/DEPS +++ b/content/gpu/DEPS @@ -1,6 +1,4 @@ include_rules = [ - "-chrome", - "+chrome/app", "+gpu/command_buffer", "+libEGL", "+libGLESv2", diff --git a/content/ppapi_plugin/DEPS b/content/ppapi_plugin/DEPS index 1f10e93..a7bbdfc 100644 --- a/content/ppapi_plugin/DEPS +++ b/content/ppapi_plugin/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "-chrome", "+content/public/plugin", "+ppapi/c", "+ppapi/proxy", diff --git a/content/renderer/DEPS b/content/renderer/DEPS index 9a7d57b..c5e4509 100644 --- a/content/renderer/DEPS +++ b/content/renderer/DEPS @@ -1,5 +1,6 @@ include_rules = [ - "+chrome/test", + # TODO(avi): remove this chrome include http://crbug.com/139631 + "+chrome/test/security_tests/renderer_sandbox_tests_mac.h", "+content/public/renderer", "+content/public/browser/native_web_keyboard_event.h", # For tests. "+content/public/browser/web_ui_controller_factory.h", # For tests. diff --git a/content/test/DEPS b/content/test/DEPS index 08c910c..aec836d 100644 --- a/content/test/DEPS +++ b/content/test/DEPS @@ -1,6 +1,4 @@ include_rules = [ - "+chrome/browser/ui/browser.h", - "+chrome/browser/ui/browser_tabstrip.h", # Testing utilities can access anything in content/ "+content", "+media/base", # For ChannelLayout in WebRTC tests. |