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 /chrome/browser/web_resource/promo_resource_service_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 'chrome/browser/web_resource/promo_resource_service_unittest.cc')
| -rw-r--r-- | chrome/browser/web_resource/promo_resource_service_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 5dd9c63..b196b12 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -6,20 +6,21 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/apps_promo.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_browser_process_test.h" +#include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" -class PromoResourceServiceTest : public TestingBrowserProcessTest { +class PromoResourceServiceTest : public testing::Test { public: PromoResourceServiceTest() - : local_state_(testing_browser_process_.get()), + : local_state_(static_cast<TestingBrowserProcess*>(g_browser_process)), web_resource_service_(new PromoResourceService(&profile_)) { } |