diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 00:38:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 00:38:35 +0000 |
| commit | 583844c2df50f0f2188aab7eed3fbcc40e499511 (patch) | |
| tree | aaf82f0bf3d39975b2ef42ab9c14716b064c4f59 /content/browser/site_instance_unittest.cc | |
| parent | 91099131f5ee2512a33e2b95f69f47d6165b1c40 (diff) | |
| download | chromium_src-583844c2df50f0f2188aab7eed3fbcc40e499511.zip chromium_src-583844c2df50f0f2188aab7eed3fbcc40e499511.tar.gz chromium_src-583844c2df50f0f2188aab7eed3fbcc40e499511.tar.bz2 | |
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
Diffstat (limited to 'content/browser/site_instance_unittest.cc')
| -rw-r--r-- | content/browser/site_instance_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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_), |