From 583844c2df50f0f2188aab7eed3fbcc40e499511 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Sat, 27 Aug 2011 00:38:35 +0000 Subject: 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 --- content/browser/site_instance_unittest.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'content/browser/site_instance_unittest.cc') 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_), -- cgit v1.1