| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "components/prefs/pref_change_registrar.h" | 7 #include "components/prefs/pref_change_registrar.h" |
| 8 #include "components/prefs/pref_observer.h" | 8 #include "components/prefs/pref_observer.h" |
| 9 #include "components/prefs/pref_registry_simple.h" | 9 #include "components/prefs/pref_registry_simple.h" |
| 10 #include "components/prefs/testing_pref_service.h" | 10 #include "components/prefs/testing_pref_service.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 protected: | 41 protected: |
| 42 void SetUp() override; | 42 void SetUp() override; |
| 43 | 43 |
| 44 base::Closure observer() const { | 44 base::Closure observer() const { |
| 45 return base::Bind(&base::DoNothing); | 45 return base::Bind(&base::DoNothing); |
| 46 } | 46 } |
| 47 | 47 |
| 48 MockPrefService* service() const { return service_.get(); } | 48 MockPrefService* service() const { return service_.get(); } |
| 49 | 49 |
| 50 private: | 50 private: |
| 51 scoped_ptr<MockPrefService> service_; | 51 std::unique_ptr<MockPrefService> service_; |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 void PrefChangeRegistrarTest::SetUp() { | 54 void PrefChangeRegistrarTest::SetUp() { |
| 55 service_.reset(new MockPrefService()); | 55 service_.reset(new MockPrefService()); |
| 56 } | 56 } |
| 57 | 57 |
| 58 TEST_F(PrefChangeRegistrarTest, AddAndRemove) { | 58 TEST_F(PrefChangeRegistrarTest, AddAndRemove) { |
| 59 PrefChangeRegistrar registrar; | 59 PrefChangeRegistrar registrar; |
| 60 registrar.Init(service()); | 60 registrar.Init(service()); |
| 61 | 61 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 PrefChangeRegistrar* pref_set = new PrefChangeRegistrar(); | 137 PrefChangeRegistrar* pref_set = new PrefChangeRegistrar(); |
| 138 base::Closure callback = base::Bind(&base::DoNothing); | 138 base::Closure callback = base::Bind(&base::DoNothing); |
| 139 pref_set->Init(pref_service_.get()); | 139 pref_set->Init(pref_service_.get()); |
| 140 pref_set->Add(kHomePage, callback); | 140 pref_set->Add(kHomePage, callback); |
| 141 pref_set->Add(kHomePageIsNewTabPage, callback); | 141 pref_set->Add(kHomePageIsNewTabPage, callback); |
| 142 return pref_set; | 142 return pref_set; |
| 143 } | 143 } |
| 144 | 144 |
| 145 MOCK_METHOD1(OnPreferenceChanged, void(const std::string&)); | 145 MOCK_METHOD1(OnPreferenceChanged, void(const std::string&)); |
| 146 | 146 |
| 147 scoped_ptr<TestingPrefServiceSimple> pref_service_; | 147 std::unique_ptr<TestingPrefServiceSimple> pref_service_; |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 TEST_F(ObserveSetOfPreferencesTest, IsObserved) { | 150 TEST_F(ObserveSetOfPreferencesTest, IsObserved) { |
| 151 scoped_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar()); | 151 std::unique_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar()); |
| 152 EXPECT_TRUE(pref_set->IsObserved(kHomePage)); | 152 EXPECT_TRUE(pref_set->IsObserved(kHomePage)); |
| 153 EXPECT_TRUE(pref_set->IsObserved(kHomePageIsNewTabPage)); | 153 EXPECT_TRUE(pref_set->IsObserved(kHomePageIsNewTabPage)); |
| 154 EXPECT_FALSE(pref_set->IsObserved(kApplicationLocale)); | 154 EXPECT_FALSE(pref_set->IsObserved(kApplicationLocale)); |
| 155 } | 155 } |
| 156 | 156 |
| 157 TEST_F(ObserveSetOfPreferencesTest, IsManaged) { | 157 TEST_F(ObserveSetOfPreferencesTest, IsManaged) { |
| 158 scoped_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar()); | 158 std::unique_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar()); |
| 159 EXPECT_FALSE(pref_set->IsManaged()); | 159 EXPECT_FALSE(pref_set->IsManaged()); |
| 160 pref_service_->SetManagedPref(kHomePage, | 160 pref_service_->SetManagedPref(kHomePage, |
| 161 new StringValue("http://crbug.com")); | 161 new StringValue("http://crbug.com")); |
| 162 EXPECT_TRUE(pref_set->IsManaged()); | 162 EXPECT_TRUE(pref_set->IsManaged()); |
| 163 pref_service_->SetManagedPref(kHomePageIsNewTabPage, | 163 pref_service_->SetManagedPref(kHomePageIsNewTabPage, |
| 164 new FundamentalValue(true)); | 164 new FundamentalValue(true)); |
| 165 EXPECT_TRUE(pref_set->IsManaged()); | 165 EXPECT_TRUE(pref_set->IsManaged()); |
| 166 pref_service_->RemoveManagedPref(kHomePage); | 166 pref_service_->RemoveManagedPref(kHomePage); |
| 167 EXPECT_TRUE(pref_set->IsManaged()); | 167 EXPECT_TRUE(pref_set->IsManaged()); |
| 168 pref_service_->RemoveManagedPref(kHomePageIsNewTabPage); | 168 pref_service_->RemoveManagedPref(kHomePageIsNewTabPage); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 189 pref_service_->SetUserPref(kHomePageIsNewTabPage, | 189 pref_service_->SetUserPref(kHomePageIsNewTabPage, |
| 190 new FundamentalValue(true)); | 190 new FundamentalValue(true)); |
| 191 Mock::VerifyAndClearExpectations(this); | 191 Mock::VerifyAndClearExpectations(this); |
| 192 | 192 |
| 193 EXPECT_CALL(*this, OnPreferenceChanged(_)).Times(0); | 193 EXPECT_CALL(*this, OnPreferenceChanged(_)).Times(0); |
| 194 pref_service_->SetUserPref(kApplicationLocale, new StringValue("en_US.utf8")); | 194 pref_service_->SetUserPref(kApplicationLocale, new StringValue("en_US.utf8")); |
| 195 Mock::VerifyAndClearExpectations(this); | 195 Mock::VerifyAndClearExpectations(this); |
| 196 } | 196 } |
| 197 | 197 |
| 198 } // namespace base | 198 } // namespace base |
| OLD | NEW |