diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 15:56:25 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 15:56:25 +0000 |
| commit | 159f06c0c7d7c88c079c2247860018756efb0725 (patch) | |
| tree | 59a3908bb18b555cbd08e6014b2aeff594278e75 | |
| parent | 8820635ab3404c1d2785f2d60ac1c9e7b3afc8fa (diff) | |
| download | chromium_src-159f06c0c7d7c88c079c2247860018756efb0725.zip chromium_src-159f06c0c7d7c88c079c2247860018756efb0725.tar.gz chromium_src-159f06c0c7d7c88c079c2247860018756efb0725.tar.bz2 | |
Tighten up DEPS checking to enforce that embedders of content only include public test headers.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10515007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140296 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/DEPS | 5 | ||||
| -rw-r--r-- | chrome/test/DEPS | 15 | ||||
| -rw-r--r-- | chrome_frame/DEPS | 3 | ||||
| -rw-r--r-- | content/public/test/DEPS | 2 | ||||
| -rw-r--r-- | ui/views/test/DEPS | 1 |
5 files changed, 10 insertions, 16 deletions
diff --git a/chrome/DEPS b/chrome/DEPS index baa8bca..c20594d 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -15,13 +15,14 @@ include_rules = [ "-chrome", "+chrome/common", "+chrome/test", - "-content", # TODO(jam): remove me once chrome only consumes content/common through its # public headers. "+content/common", "+content/public/common", "+content/public/test", - "+content/test", + "+content/test/gpu", + "+content/test/net", + "+content/test/browser_test_base.h", # http://crbug.com/90448 # TODO(ben): remove this "+content/public/browser/native_web_keyboard_event.h", diff --git a/chrome/test/DEPS b/chrome/test/DEPS index 71d7c8f..e87cf60 100644 --- a/chrome/test/DEPS +++ b/chrome/test/DEPS @@ -2,23 +2,16 @@ include_rules = [ # The test directory can do whatever it wants in chrome. "+chrome", - # Tests under chrome/ shouldn't need to access the internals of - # content/ and as such are allowed only content/public and - # content/test (which is the "public" directory for tests depending - # on content/). If you find yourself wanting to write such a test, - # or a test that depends primarily on content, think about whether - # the test belongs under content/, or should be split up into a test + # Tests under chrome/ shouldn't need to access the internals of content/ and + # as such are allowed only content/public. If you find yourself wanting to + # write such a test, or a test that depends primarily on content, think about + # whether the test belongs under content/, or should be split up into a test # within content/ and a test within chrome/. - "-content", "+content/public", - "+content/test", # TODO(joi): Need to remove all of these and use only content/public # and content/test. http://crbug.com/98716 # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW! - "+content/browser/net/url_request_mock_http_job.h", - "+content/browser/net/url_request_slow_http_job.h", - "+content/browser/trace_controller.h", "+content/common/debug_flags.h", "+content/common/injection_test_dll.h", "+content/renderer/mock_content_renderer_client.h", diff --git a/chrome_frame/DEPS b/chrome_frame/DEPS index 37aaf9b..f75ba96 100644 --- a/chrome_frame/DEPS +++ b/chrome_frame/DEPS @@ -1,6 +1,5 @@ include_rules = [ - "-content", "+content/public/browser", "+content/public/common", - "+content/test", + "+content/public/test", ] diff --git a/content/public/test/DEPS b/content/public/test/DEPS index f78172a..51c7b43 100644 --- a/content/public/test/DEPS +++ b/content/public/test/DEPS @@ -1,4 +1,6 @@ include_rules = [ + "-content", + "+content/public", # DO NOT ADD ANY ENTRIES TO INTERNAL CONTENT HEADERS! # TODO(jam): remove "+content/test/content_browser_test.h", diff --git a/ui/views/test/DEPS b/ui/views/test/DEPS index f8601b6..b969a40 100644 --- a/ui/views/test/DEPS +++ b/ui/views/test/DEPS @@ -1,4 +1,3 @@ include_rules = [ - "+content/test", "+content/public/test", ] |