| Index: chrome/browser/managed_prefs_banner_base_unittest.cc
|
| diff --git a/chrome/browser/managed_prefs_banner_base_unittest.cc b/chrome/browser/managed_prefs_banner_base_unittest.cc
|
| index 7955ebf5319ff1db9fff6285aa832549c06055a0..60bad07aa9963819f05e335b152414bce9235a32 100644
|
| --- a/chrome/browser/managed_prefs_banner_base_unittest.cc
|
| +++ b/chrome/browser/managed_prefs_banner_base_unittest.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "chrome/browser/dummy_pref_store.h"
|
| #include "chrome/browser/managed_prefs_banner_base.h"
|
| -#include "chrome/browser/pref_service.h"
|
| #include "chrome/common/pref_names.h"
|
| +#include "chrome/test/testing_pref_service.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -20,37 +20,25 @@ const wchar_t* kDummyPref = L"dummy";
|
| class ManagedPrefsBannerBaseTest : public testing::Test {
|
| public:
|
| virtual void SetUp() {
|
| - managed_prefs_ = new DummyPrefStore;
|
| - extension_prefs_ = new DummyPrefStore;
|
| - command_line_prefs_ = new DummyPrefStore;
|
| - user_prefs_ = new DummyPrefStore;
|
| - default_prefs_ = new DummyPrefStore;
|
| - pref_service_.reset(new PrefService(new PrefValueStore(managed_prefs_,
|
| - extension_prefs_,
|
| - command_line_prefs_,
|
| - user_prefs_,
|
| - default_prefs_)));
|
| + pref_service_.reset(new TestingPrefService);
|
| pref_service_->RegisterStringPref(prefs::kHomePage, "http://google.com");
|
| pref_service_->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, false);
|
| pref_service_->RegisterBooleanPref(kDummyPref, false);
|
| }
|
|
|
| - scoped_ptr<PrefService> pref_service_;
|
| - DummyPrefStore* managed_prefs_;
|
| - DummyPrefStore* extension_prefs_;
|
| - DummyPrefStore* command_line_prefs_;
|
| - DummyPrefStore* user_prefs_;
|
| - DummyPrefStore* default_prefs_;
|
| + scoped_ptr<TestingPrefService> pref_service_;
|
| };
|
|
|
| TEST_F(ManagedPrefsBannerBaseTest, VisibilityTest) {
|
| ManagedPrefsBannerBase banner(pref_service_.get(), OPTIONS_PAGE_GENERAL);
|
| EXPECT_FALSE(banner.DetermineVisibility());
|
| - managed_prefs_->prefs()->SetBoolean(kDummyPref, true);
|
| + pref_service_->SetManagedPref(kDummyPref, Value::CreateBooleanValue(true));
|
| EXPECT_FALSE(banner.DetermineVisibility());
|
| - user_prefs_->prefs()->SetString(prefs::kHomePage, "http://foo.com");
|
| + pref_service_->SetUserPref(prefs::kHomePage,
|
| + Value::CreateStringValue("http://foo.com"));
|
| EXPECT_FALSE(banner.DetermineVisibility());
|
| - managed_prefs_->prefs()->SetString(prefs::kHomePage, "http://bar.com");
|
| + pref_service_->SetManagedPref(prefs::kHomePage,
|
| + Value::CreateStringValue("http://bar.com"));
|
| EXPECT_TRUE(banner.DetermineVisibility());
|
| }
|
|
|
|
|