diff options
| author | carlosk <carlosk@chromium.org> | 2016-02-02 06:53:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 15:00:18 +0000 |
| commit | 282c437e03c572e955ef7cf85d2bf5f8f43f1f99 (patch) | |
| tree | 2958fe0eeec11ce6acee8e725007479bfa973e6c /chromecast | |
| parent | 15f972b06df0017e7a873027e395f1a63f02b09c (diff) | |
| download | chromium_src-282c437e03c572e955ef7cf85d2bf5f8f43f1f99.zip chromium_src-282c437e03c572e955ef7cf85d2bf5f8f43f1f99.tar.gz chromium_src-282c437e03c572e955ef7cf85d2bf5f8f43f1f99.tar.bz2 | |
Reland #2: Eliminate browser test helpers from unit tests.
This change eliminates dependencies of browser_test_utils.h and
in_process_browser_test.h from unit tests and eliminates the future
possibility of adding them back by changing gn and gyp configurations.
This also renames one test from "unit" to "browser" as it seems more
appropriate for the case.
Revert CL: http://crbug.com/1658733002
Reverted CL: http://crbug.com/1613123002
BUG=514788
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1659843002
Cr-Commit-Position: refs/heads/master@{#372941}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/browser/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromecast/chromecast_tests.gypi | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn index f187fe3..597033e 100644 --- a/chromecast/browser/BUILD.gn +++ b/chromecast/browser/BUILD.gn @@ -157,6 +157,7 @@ source_set("test_support") { public_deps = [ ":browser", "//chromecast:cast_shell_common", + "//content/test:browsertest_base", ] deps = [ @@ -184,6 +185,7 @@ test("cast_shell_browser_test") { deps = [ ":test_support", "//base", + "//content/test:browsertest_base", "//content/test:test_support", "//media/base:test_support", "//testing/gtest", diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi index 7fbbde9..804d673 100644 --- a/chromecast/chromecast_tests.gypi +++ b/chromecast/chromecast_tests.gypi @@ -338,10 +338,14 @@ ], 'dependencies': [ 'cast_shell_core', + '../content/content_shell_and_tests.gyp:content_browser_test_base', '../content/content_shell_and_tests.gyp:content_browser_test_support', '../testing/gtest.gyp:gtest', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', ], + 'export_dependent_settings': [ + '../content/content_shell_and_tests.gyp:content_browser_test_base', + ], 'sources': [ 'browser/test/chromecast_browser_test.cc', 'browser/test/chromecast_browser_test.h', |