diff options
| -rw-r--r-- | chrome/DEPS | 1 | ||||
| -rw-r--r-- | chrome/test/base/in_process_browser_test.h | 4 | ||||
| -rw-r--r-- | content/content_tests.gypi | 2 | ||||
| -rw-r--r-- | content/public/test/DEPS | 3 | ||||
| -rw-r--r-- | content/public/test/browser_test_base.h (renamed from content/test/browser_test_base.h) | 10 | ||||
| -rw-r--r-- | content/test/browser_test_base.cc | 8 | ||||
| -rw-r--r-- | content/test/content_browser_test.h | 2 |
7 files changed, 17 insertions, 13 deletions
diff --git a/chrome/DEPS b/chrome/DEPS index 97cef999..b3ab3de 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -26,7 +26,6 @@ include_rules = [ "+content/public/test", "+content/test/gpu", "+content/test/net", - "+content/test/browser_test_base.h", # http://crbug.com/90448 # Don't allow inclusion of these other libs we shouldn't be calling directly. "-webkit", diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h index a404906..fa2f683 100644 --- a/chrome/test/base/in_process_browser_test.h +++ b/chrome/test/base/in_process_browser_test.h @@ -11,7 +11,7 @@ #include "base/scoped_temp_dir.h" #include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test.h" -#include "content/test/browser_test_base.h" +#include "content/public/test/browser_test_base.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) @@ -93,7 +93,7 @@ class RuleBasedHostResolverProc; // } // // This is recursive, so PRE_PRE_Bar would run before PRE_BAR. -class InProcessBrowserTest : public BrowserTestBase { +class InProcessBrowserTest : public content::BrowserTestBase { public: InProcessBrowserTest(); virtual ~InProcessBrowserTest(); diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 02ae94a..181b8fb 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -28,6 +28,7 @@ 'sources': [ 'public/test/accessibility_test_utils_win.h', 'public/test/browser_test.h', + 'public/test/browser_test_base.h', 'public/test/browser_test_utils.h', 'public/test/content_test_suite_base.h', 'public/test/download_test_observer.h', @@ -78,7 +79,6 @@ 'gpu/gpu_idirect3d9_mock_win.h', 'test/accessibility_test_utils_win.cc', 'test/browser_test_base.cc', - 'test/browser_test_base.h', 'test/browser_test_utils.cc', 'test/content_test_suite.cc', 'test/content_test_suite.h', diff --git a/content/public/test/DEPS b/content/public/test/DEPS index 51c7b43..0d7d77e 100644 --- a/content/public/test/DEPS +++ b/content/public/test/DEPS @@ -1,7 +1,4 @@ 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/content/test/browser_test_base.h b/content/public/test/browser_test_base.h index 90a639f..40c9e0f 100644 --- a/content/test/browser_test_base.h +++ b/content/public/test/browser_test_base.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_TEST_BROWSER_TEST_BASE_H_ -#define CONTENT_TEST_BROWSER_TEST_BASE_H_ +#ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_ +#define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_ #include "base/compiler_specific.h" #include "testing/gtest/include/gtest/gtest.h" @@ -11,6 +11,8 @@ class CommandLine; +namespace content { + class BrowserTestBase : public testing::Test { public: BrowserTestBase(); @@ -87,4 +89,6 @@ class BrowserTestBase : public testing::Test { #endif }; -#endif // CONTENT_TEST_BROWSER_TEST_BASE_H_ +} // namespace content + +#endif // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_ diff --git a/content/test/browser_test_base.cc b/content/test/browser_test_base.cc index 2e33fa0..24b0577 100644 --- a/content/test/browser_test_base.cc +++ b/content/test/browser_test_base.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/browser_test_base.h" +#include "content/public/test/browser_test_base.h" #include "base/bind.h" #include "base/command_line.h" @@ -38,6 +38,8 @@ static void DumpStackTraceSignalHandler(int signal) { } // namespace +namespace content { + BrowserTestBase::BrowserTestBase() { #if defined(OS_MACOSX) base::mac::SetOverrideAmIBundled(true); @@ -60,7 +62,7 @@ void BrowserTestBase::SetUp() { command_line->AppendSwitch(switches::kDomAutomationController); - content::MainFunctionParams params(*command_line); + MainFunctionParams params(*command_line); params.ui_task = new base::Closure( base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this)); @@ -90,3 +92,5 @@ void BrowserTestBase::CreateTestServer(const char* test_server_base) { net::TestServer::kLocalhost, FilePath().AppendASCII(test_server_base))); } + +} // namespace content diff --git a/content/test/content_browser_test.h b/content/test/content_browser_test.h index 5870bb0..6217f2d 100644 --- a/content/test/content_browser_test.h +++ b/content/test/content_browser_test.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "content/public/test/browser_test.h" -#include "content/test/browser_test_base.h" +#include "content/public/test/browser_test_base.h" class GURL; |