summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/apps_promo_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-27 00:38:35 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-27 00:38:35 +0000
commit583844c2df50f0f2188aab7eed3fbcc40e499511 (patch)
treeaaf82f0bf3d39975b2ef42ab9c14716b064c4f59 /chrome/browser/extensions/apps_promo_unittest.cc
parent91099131f5ee2512a33e2b95f69f47d6165b1c40 (diff)
downloadchromium_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/extensions/apps_promo_unittest.cc')
-rw-r--r--chrome/browser/extensions/apps_promo_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/apps_promo_unittest.cc b/chrome/browser/extensions/apps_promo_unittest.cc
index accfd5b..607da43 100644
--- a/chrome/browser/extensions/apps_promo_unittest.cc
+++ b/chrome/browser/extensions/apps_promo_unittest.cc
@@ -3,12 +3,13 @@
// found in the LICENSE file.
#include "base/logging.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/apps_promo.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
#include "chrome/common/extensions/extension.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 "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -42,7 +43,7 @@ void ExpectAppsPromoHidden(PrefService* prefs) {
} // namespace
-class ExtensionAppsPromo : public TestingBrowserProcessTest {
+class ExtensionAppsPromo : public testing::Test {
public:
TestingPrefService* prefs() { return &prefs_; }
AppsPromo* apps_promo() { return &apps_promo_; }
@@ -60,7 +61,7 @@ class ExtensionAppsPromo : public TestingBrowserProcessTest {
};
ExtensionAppsPromo::ExtensionAppsPromo()
- : local_state_(testing_browser_process_.get()),
+ : local_state_(static_cast<TestingBrowserProcess*>(g_browser_process)),
apps_promo_(&prefs_) {
}