Switch ChromeTestSuite to the same convention as ContentTestSuite:

the test suite implicitly provides global resources for each test,
but they're re-initialized between each test.

The performance overhead is negligible.

We need that to continue moving tests from unit_tests
to content_unittests. Because of shared test fixtures
the test suites need to be compatible.

BUG=90443

Review URL: http://codereview.chromium.org/7744039

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

11 files changed, 13 insertions, 18 deletions

diff --git a/content/browser/DEPS b/content/browser/DEPS
index 4794649..7fec844 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -6,5 +6,6 @@ include_rules = [
   # for more information.
 
   # ONLY USED BY TESTS
+	"+chrome/browser/browser_process.h",
   "+chrome/browser/ui/browser.h",
 ]
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index 304bcd9..668054e 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ -142,7 +144,8 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedTab) {
   TestTabContentsDelegate delegate;
   contents()->set_delegate(&delegate);
 
-  testing_browser_process_.get()->SetDevToolsManager(new DevToolsManager());
+  static_cast<TestingBrowserProcess*>(g_browser_process)->
+      SetDevToolsManager(new DevToolsManager());
   DevToolsManager* manager = DevToolsManager::GetInstance();
   ASSERT_TRUE(manager);
 
diff --git a/content/browser/in_process_webkit/dom_storage_unittest.cc b/content/browser/in_process_webkit/dom_storage_unittest.cc
index 9c37adc..03cffe4 100644
--- a/content/browser/in_process_webkit/dom_storage_unittest.cc
+++ b/content/browser/in_process_webkit/dom_storage_unittest.cc
@@ -5,12 +5,12 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
-class DOMStorageTest : public TestingBrowserProcessTest {
+class DOMStorageTest : public testing::Test {
  public:
   DOMStorageTest()
       : message_loop_(MessageLoop::TYPE_IO),
diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
index 19a544c..72fdc49 100644
--- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
+++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/in_process_webkit/indexed_db_context.h"
 #include "content/browser/in_process_webkit/indexed_db_quota_client.h"
@@ -24,7 +23,7 @@ static const quota::StorageType kPerm = quota::kStorageTypePersistent;
 using namespace webkit_database;
 
 // Base class for our test fixtures.
-class IndexedDBQuotaClientTest : public TestingBrowserProcessTest {
+class IndexedDBQuotaClientTest : public testing::Test {
  public:
   const GURL kOriginA;
   const GURL kOriginB;
diff --git a/content/browser/in_process_webkit/webkit_context_unittest.cc b/content/browser/in_process_webkit/webkit_context_unittest.cc
index 6ad6f6e..3e94a9d 100644
--- a/content/browser/in_process_webkit/webkit_context_unittest.cc
+++ b/content/browser/in_process_webkit/webkit_context_unittest.cc
@@ -30,7 +30,6 @@ class MockDOMStorageContext : public DOMStorageContext {
 };
 
 TEST(WebKitContextTest, Basic) {
-  ScopedTestingBrowserProcess browser_process;
   TestingProfile profile;
   scoped_refptr<WebKitContext> context1(new WebKitContext(
           profile.IsOffTheRecord(), profile.GetPath(),
@@ -48,8 +47,6 @@ TEST(WebKitContextTest, Basic) {
 }
 
 TEST(WebKitContextTest, PurgeMemory) {
-  ScopedTestingBrowserProcess browser_process;
-
   // Start up a WebKit thread for the WebKitContext to call the
   // DOMStorageContext on.
   MessageLoop message_loop(MessageLoop::TYPE_DEFAULT);
diff --git a/content/browser/plugin_service_unittest.cc b/content/browser/plugin_service_unittest.cc
index 4e254db..4d9f420 100644
--- a/content/browser/plugin_service_unittest.cc
+++ b/content/browser/plugin_service_unittest.cc
@@ -4,13 +4,12 @@
 
 #include "content/browser/plugin_service.h"
 
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-class PluginServiceTest : public TestingBrowserProcessTest {
+class PluginServiceTest : public testing::Test {
  public:
   PluginServiceTest()
       : message_loop_(MessageLoop::TYPE_IO),
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 1cbb45e..b2e65346 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -245,7 +245,7 @@ class MockPaintingObserver : public NotificationObserver {
 
 // RenderWidgetHostTest --------------------------------------------------------
 
-class RenderWidgetHostTest : public TestingBrowserProcessTest {
+class RenderWidgetHostTest : public testing::Test {
  public:
   RenderWidgetHostTest() : process_(NULL) {
   }
diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
index 9a79900..8761a93 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -15,7 +15,6 @@
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/page_transition_types.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gfx {
@@ -283,7 +282,7 @@ class TestRenderViewHostFactory : public RenderViewHostFactory {
 
 // RenderViewHostTestHarness ---------------------------------------------------
 
-class RenderViewHostTestHarness : public TestingBrowserProcessTest {
+class RenderViewHostTestHarness : public testing::Test {
  public:
   RenderViewHostTestHarness();
   virtual ~RenderViewHostTestHarness();
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index 858b6a43..58bc415 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -5,7 +5,6 @@
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/browsing_instance.h"
@@ -75,7 +74,7 @@ class SiteInstanceTestBrowserClient : public content::MockContentBrowserClient {
   content::ContentBrowserClient* old_browser_client_;
 };
 
-class SiteInstanceTest : public TestingBrowserProcessTest {
+class SiteInstanceTest : public testing::Test {
  public:
   SiteInstanceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
diff --git a/content/browser/tab_contents/navigation_entry_unittest.cc b/content/browser/tab_contents/navigation_entry_unittest.cc
index f67696f..ee7d083 100644
--- a/content/browser/tab_contents/navigation_entry_unittest.cc
+++ b/content/browser/tab_contents/navigation_entry_unittest.cc
@@ -5,12 +5,11 @@
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class NavigationEntryTest : public TestingBrowserProcessTest {
+class NavigationEntryTest : public testing::Test {
  public:
   NavigationEntryTest() : instance_(NULL) {
   }
diff --git a/content/browser/tab_contents/tab_contents_delegate_unittest.cc b/content/browser/tab_contents/tab_contents_delegate_unittest.cc
index b23929a..55a25b8 100644
--- a/content/browser/tab_contents/tab_contents_delegate_unittest.cc
+++ b/content/browser/tab_contents/tab_contents_delegate_unittest.cc
@@ -62,7 +62,6 @@ class MockTabContentsDelegate : public TabContentsDelegate {
 
 TEST(TabContentsDelegateTest, UnregisterInDestructor) {
   MessageLoop loop(MessageLoop::TYPE_UI);
-  ScopedTestingBrowserProcess browser_process;
   scoped_ptr<MockTabContentsDelegate> delegate(new MockTabContentsDelegate());
   scoped_ptr<Profile> profile(new TestingProfile());
   scoped_ptr<TabContents> contents_a(