| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/prefs/overlay_user_pref_store.h" | 5 #include "base/prefs/overlay_user_pref_store.h" |
| 6 |
| 6 #include "base/prefs/pref_store_observer_mock.h" | 7 #include "base/prefs/pref_store_observer_mock.h" |
| 7 #include "base/prefs/testing_pref_store.h" | 8 #include "base/prefs/testing_pref_store.h" |
| 8 #include "base/values.h" | 9 #include "base/values.h" |
| 9 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 11 | 12 |
| 12 using ::testing::Mock; | 13 using ::testing::Mock; |
| 13 using ::testing::StrEq; | 14 using ::testing::StrEq; |
| 14 | 15 |
| 16 namespace base { |
| 15 namespace { | 17 namespace { |
| 16 | 18 |
| 17 const char kBrowserWindowPlacement[] = "browser.window_placement"; | 19 const char kBrowserWindowPlacement[] = "browser.window_placement"; |
| 18 const char kShowBookmarkBar[] = "bookmark_bar.show_on_all_tabs"; | 20 const char kShowBookmarkBar[] = "bookmark_bar.show_on_all_tabs"; |
| 19 | 21 |
| 20 const char* overlay_key = kBrowserWindowPlacement; | 22 const char* overlay_key = kBrowserWindowPlacement; |
| 21 const char* regular_key = kShowBookmarkBar; | 23 const char* regular_key = kShowBookmarkBar; |
| 22 // With the removal of the kWebKitGlobalXXX prefs, we'll no longer have real | 24 // With the removal of the kWebKitGlobalXXX prefs, we'll no longer have real |
| 23 // prefs using the overlay pref store, so make up keys here. | 25 // prefs using the overlay pref store, so make up keys here. |
| 24 const char* mapped_overlay_key = "test.per_tab.javascript_enabled"; | 26 const char* mapped_overlay_key = "test.per_tab.javascript_enabled"; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 40 scoped_refptr<TestingPrefStore> underlay_; | 42 scoped_refptr<TestingPrefStore> underlay_; |
| 41 scoped_refptr<OverlayUserPrefStore> overlay_; | 43 scoped_refptr<OverlayUserPrefStore> overlay_; |
| 42 }; | 44 }; |
| 43 | 45 |
| 44 TEST_F(OverlayUserPrefStoreTest, Observer) { | 46 TEST_F(OverlayUserPrefStoreTest, Observer) { |
| 45 PrefStoreObserverMock obs; | 47 PrefStoreObserverMock obs; |
| 46 overlay_->AddObserver(&obs); | 48 overlay_->AddObserver(&obs); |
| 47 | 49 |
| 48 // Check that underlay first value is reported. | 50 // Check that underlay first value is reported. |
| 49 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); | 51 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); |
| 50 underlay_->SetValue(overlay_key, Value::CreateIntegerValue(42)); | 52 underlay_->SetValue(overlay_key, new FundamentalValue(42)); |
| 51 Mock::VerifyAndClearExpectations(&obs); | 53 Mock::VerifyAndClearExpectations(&obs); |
| 52 | 54 |
| 53 // Check that underlay overwriting is reported. | 55 // Check that underlay overwriting is reported. |
| 54 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); | 56 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); |
| 55 underlay_->SetValue(overlay_key, Value::CreateIntegerValue(43)); | 57 underlay_->SetValue(overlay_key, new FundamentalValue(43)); |
| 56 Mock::VerifyAndClearExpectations(&obs); | 58 Mock::VerifyAndClearExpectations(&obs); |
| 57 | 59 |
| 58 // Check that overwriting change in overlay is reported. | 60 // Check that overwriting change in overlay is reported. |
| 59 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); | 61 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); |
| 60 overlay_->SetValue(overlay_key, Value::CreateIntegerValue(44)); | 62 overlay_->SetValue(overlay_key, new FundamentalValue(44)); |
| 61 Mock::VerifyAndClearExpectations(&obs); | 63 Mock::VerifyAndClearExpectations(&obs); |
| 62 | 64 |
| 63 // Check that hidden underlay change is not reported. | 65 // Check that hidden underlay change is not reported. |
| 64 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0); | 66 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0); |
| 65 underlay_->SetValue(overlay_key, Value::CreateIntegerValue(45)); | 67 underlay_->SetValue(overlay_key, new FundamentalValue(45)); |
| 66 Mock::VerifyAndClearExpectations(&obs); | 68 Mock::VerifyAndClearExpectations(&obs); |
| 67 | 69 |
| 68 // Check that overlay remove is reported. | 70 // Check that overlay remove is reported. |
| 69 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); | 71 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); |
| 70 overlay_->RemoveValue(overlay_key); | 72 overlay_->RemoveValue(overlay_key); |
| 71 Mock::VerifyAndClearExpectations(&obs); | 73 Mock::VerifyAndClearExpectations(&obs); |
| 72 | 74 |
| 73 // Check that underlay remove is reported. | 75 // Check that underlay remove is reported. |
| 74 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); | 76 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1); |
| 75 underlay_->RemoveValue(overlay_key); | 77 underlay_->RemoveValue(overlay_key); |
| 76 Mock::VerifyAndClearExpectations(&obs); | 78 Mock::VerifyAndClearExpectations(&obs); |
| 77 | 79 |
| 78 // Check respecting of silence. | 80 // Check respecting of silence. |
| 79 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0); | 81 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0); |
| 80 overlay_->SetValueSilently(overlay_key, Value::CreateIntegerValue(46)); | 82 overlay_->SetValueSilently(overlay_key, new FundamentalValue(46)); |
| 81 Mock::VerifyAndClearExpectations(&obs); | 83 Mock::VerifyAndClearExpectations(&obs); |
| 82 | 84 |
| 83 overlay_->RemoveObserver(&obs); | 85 overlay_->RemoveObserver(&obs); |
| 84 | 86 |
| 85 // Check successful unsubscription. | 87 // Check successful unsubscription. |
| 86 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0); | 88 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0); |
| 87 underlay_->SetValue(overlay_key, Value::CreateIntegerValue(47)); | 89 underlay_->SetValue(overlay_key, new FundamentalValue(47)); |
| 88 overlay_->SetValue(overlay_key, Value::CreateIntegerValue(48)); | 90 overlay_->SetValue(overlay_key, new FundamentalValue(48)); |
| 89 Mock::VerifyAndClearExpectations(&obs); | 91 Mock::VerifyAndClearExpectations(&obs); |
| 90 } | 92 } |
| 91 | 93 |
| 92 TEST_F(OverlayUserPrefStoreTest, GetAndSet) { | 94 TEST_F(OverlayUserPrefStoreTest, GetAndSet) { |
| 93 const Value* value = NULL; | 95 const Value* value = NULL; |
| 94 EXPECT_FALSE(overlay_->GetValue(overlay_key, &value)); | 96 EXPECT_FALSE(overlay_->GetValue(overlay_key, &value)); |
| 95 EXPECT_FALSE(underlay_->GetValue(overlay_key, &value)); | 97 EXPECT_FALSE(underlay_->GetValue(overlay_key, &value)); |
| 96 | 98 |
| 97 underlay_->SetValue(overlay_key, Value::CreateIntegerValue(42)); | 99 underlay_->SetValue(overlay_key, new FundamentalValue(42)); |
| 98 | 100 |
| 99 // Value shines through: | 101 // Value shines through: |
| 100 EXPECT_TRUE(overlay_->GetValue(overlay_key, &value)); | 102 EXPECT_TRUE(overlay_->GetValue(overlay_key, &value)); |
| 101 EXPECT_TRUE(base::FundamentalValue(42).Equals(value)); | 103 EXPECT_TRUE(base::FundamentalValue(42).Equals(value)); |
| 102 | 104 |
| 103 EXPECT_TRUE(underlay_->GetValue(overlay_key, &value)); | 105 EXPECT_TRUE(underlay_->GetValue(overlay_key, &value)); |
| 104 EXPECT_TRUE(base::FundamentalValue(42).Equals(value)); | 106 EXPECT_TRUE(base::FundamentalValue(42).Equals(value)); |
| 105 | 107 |
| 106 overlay_->SetValue(overlay_key, Value::CreateIntegerValue(43)); | 108 overlay_->SetValue(overlay_key, new FundamentalValue(43)); |
| 107 | 109 |
| 108 EXPECT_TRUE(overlay_->GetValue(overlay_key, &value)); | 110 EXPECT_TRUE(overlay_->GetValue(overlay_key, &value)); |
| 109 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); | 111 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); |
| 110 | 112 |
| 111 EXPECT_TRUE(underlay_->GetValue(overlay_key, &value)); | 113 EXPECT_TRUE(underlay_->GetValue(overlay_key, &value)); |
| 112 EXPECT_TRUE(base::FundamentalValue(42).Equals(value)); | 114 EXPECT_TRUE(base::FundamentalValue(42).Equals(value)); |
| 113 | 115 |
| 114 overlay_->RemoveValue(overlay_key); | 116 overlay_->RemoveValue(overlay_key); |
| 115 | 117 |
| 116 // Value shines through: | 118 // Value shines through: |
| (...skipping 29 matching lines...) Expand all Loading... |
| 146 | 148 |
| 147 // Here we consider a global preference that is not overlayed. | 149 // Here we consider a global preference that is not overlayed. |
| 148 TEST_F(OverlayUserPrefStoreTest, GlobalPref) { | 150 TEST_F(OverlayUserPrefStoreTest, GlobalPref) { |
| 149 PrefStoreObserverMock obs; | 151 PrefStoreObserverMock obs; |
| 150 overlay_->AddObserver(&obs); | 152 overlay_->AddObserver(&obs); |
| 151 | 153 |
| 152 const Value* value = NULL; | 154 const Value* value = NULL; |
| 153 | 155 |
| 154 // Check that underlay first value is reported. | 156 // Check that underlay first value is reported. |
| 155 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); | 157 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); |
| 156 underlay_->SetValue(regular_key, Value::CreateIntegerValue(42)); | 158 underlay_->SetValue(regular_key, new FundamentalValue(42)); |
| 157 Mock::VerifyAndClearExpectations(&obs); | 159 Mock::VerifyAndClearExpectations(&obs); |
| 158 | 160 |
| 159 // Check that underlay overwriting is reported. | 161 // Check that underlay overwriting is reported. |
| 160 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); | 162 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); |
| 161 underlay_->SetValue(regular_key, Value::CreateIntegerValue(43)); | 163 underlay_->SetValue(regular_key, new FundamentalValue(43)); |
| 162 Mock::VerifyAndClearExpectations(&obs); | 164 Mock::VerifyAndClearExpectations(&obs); |
| 163 | 165 |
| 164 // Check that we get this value from the overlay | 166 // Check that we get this value from the overlay |
| 165 EXPECT_TRUE(overlay_->GetValue(regular_key, &value)); | 167 EXPECT_TRUE(overlay_->GetValue(regular_key, &value)); |
| 166 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); | 168 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); |
| 167 | 169 |
| 168 // Check that overwriting change in overlay is reported. | 170 // Check that overwriting change in overlay is reported. |
| 169 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); | 171 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); |
| 170 overlay_->SetValue(regular_key, Value::CreateIntegerValue(44)); | 172 overlay_->SetValue(regular_key, new FundamentalValue(44)); |
| 171 Mock::VerifyAndClearExpectations(&obs); | 173 Mock::VerifyAndClearExpectations(&obs); |
| 172 | 174 |
| 173 // Check that we get this value from the overlay and the underlay. | 175 // Check that we get this value from the overlay and the underlay. |
| 174 EXPECT_TRUE(overlay_->GetValue(regular_key, &value)); | 176 EXPECT_TRUE(overlay_->GetValue(regular_key, &value)); |
| 175 EXPECT_TRUE(base::FundamentalValue(44).Equals(value)); | 177 EXPECT_TRUE(base::FundamentalValue(44).Equals(value)); |
| 176 EXPECT_TRUE(underlay_->GetValue(regular_key, &value)); | 178 EXPECT_TRUE(underlay_->GetValue(regular_key, &value)); |
| 177 EXPECT_TRUE(base::FundamentalValue(44).Equals(value)); | 179 EXPECT_TRUE(base::FundamentalValue(44).Equals(value)); |
| 178 | 180 |
| 179 // Check that overlay remove is reported. | 181 // Check that overlay remove is reported. |
| 180 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); | 182 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1); |
| 181 overlay_->RemoveValue(regular_key); | 183 overlay_->RemoveValue(regular_key); |
| 182 Mock::VerifyAndClearExpectations(&obs); | 184 Mock::VerifyAndClearExpectations(&obs); |
| 183 | 185 |
| 184 // Check that value was removed from overlay and underlay | 186 // Check that value was removed from overlay and underlay |
| 185 EXPECT_FALSE(overlay_->GetValue(regular_key, &value)); | 187 EXPECT_FALSE(overlay_->GetValue(regular_key, &value)); |
| 186 EXPECT_FALSE(underlay_->GetValue(regular_key, &value)); | 188 EXPECT_FALSE(underlay_->GetValue(regular_key, &value)); |
| 187 | 189 |
| 188 // Check respecting of silence. | 190 // Check respecting of silence. |
| 189 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0); | 191 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0); |
| 190 overlay_->SetValueSilently(regular_key, Value::CreateIntegerValue(46)); | 192 overlay_->SetValueSilently(regular_key, new FundamentalValue(46)); |
| 191 Mock::VerifyAndClearExpectations(&obs); | 193 Mock::VerifyAndClearExpectations(&obs); |
| 192 | 194 |
| 193 overlay_->RemoveObserver(&obs); | 195 overlay_->RemoveObserver(&obs); |
| 194 | 196 |
| 195 // Check successful unsubscription. | 197 // Check successful unsubscription. |
| 196 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0); | 198 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0); |
| 197 underlay_->SetValue(regular_key, Value::CreateIntegerValue(47)); | 199 underlay_->SetValue(regular_key, new FundamentalValue(47)); |
| 198 overlay_->SetValue(regular_key, Value::CreateIntegerValue(48)); | 200 overlay_->SetValue(regular_key, new FundamentalValue(48)); |
| 199 Mock::VerifyAndClearExpectations(&obs); | 201 Mock::VerifyAndClearExpectations(&obs); |
| 200 } | 202 } |
| 201 | 203 |
| 202 // Check that names mapping works correctly. | 204 // Check that names mapping works correctly. |
| 203 TEST_F(OverlayUserPrefStoreTest, NamesMapping) { | 205 TEST_F(OverlayUserPrefStoreTest, NamesMapping) { |
| 204 PrefStoreObserverMock obs; | 206 PrefStoreObserverMock obs; |
| 205 overlay_->AddObserver(&obs); | 207 overlay_->AddObserver(&obs); |
| 206 | 208 |
| 207 const Value* value = NULL; | 209 const Value* value = NULL; |
| 208 | 210 |
| 209 // Check that if there is no override in the overlay, changing underlay value | 211 // Check that if there is no override in the overlay, changing underlay value |
| 210 // is reported as changing an overlay value. | 212 // is reported as changing an overlay value. |
| 211 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); | 213 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); |
| 212 underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(42)); | 214 underlay_->SetValue(mapped_underlay_key, new FundamentalValue(42)); |
| 213 Mock::VerifyAndClearExpectations(&obs); | 215 Mock::VerifyAndClearExpectations(&obs); |
| 214 | 216 |
| 215 // Check that underlay overwriting is reported. | 217 // Check that underlay overwriting is reported. |
| 216 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); | 218 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); |
| 217 underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(43)); | 219 underlay_->SetValue(mapped_underlay_key, new FundamentalValue(43)); |
| 218 Mock::VerifyAndClearExpectations(&obs); | 220 Mock::VerifyAndClearExpectations(&obs); |
| 219 | 221 |
| 220 // Check that we get this value from the overlay with both keys | 222 // Check that we get this value from the overlay with both keys |
| 221 EXPECT_TRUE(overlay_->GetValue(mapped_overlay_key, &value)); | 223 EXPECT_TRUE(overlay_->GetValue(mapped_overlay_key, &value)); |
| 222 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); | 224 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); |
| 223 // In this case, overlay reads directly from the underlay. | 225 // In this case, overlay reads directly from the underlay. |
| 224 EXPECT_TRUE(overlay_->GetValue(mapped_underlay_key, &value)); | 226 EXPECT_TRUE(overlay_->GetValue(mapped_underlay_key, &value)); |
| 225 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); | 227 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); |
| 226 | 228 |
| 227 // Check that overwriting change in overlay is reported. | 229 // Check that overwriting change in overlay is reported. |
| 228 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); | 230 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); |
| 229 overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(44)); | 231 overlay_->SetValue(mapped_overlay_key, new FundamentalValue(44)); |
| 230 Mock::VerifyAndClearExpectations(&obs); | 232 Mock::VerifyAndClearExpectations(&obs); |
| 231 | 233 |
| 232 // Check that we get an overriden value from overlay, while reading the | 234 // Check that we get an overriden value from overlay, while reading the |
| 233 // value from underlay still holds an old value. | 235 // value from underlay still holds an old value. |
| 234 EXPECT_TRUE(overlay_->GetValue(mapped_overlay_key, &value)); | 236 EXPECT_TRUE(overlay_->GetValue(mapped_overlay_key, &value)); |
| 235 EXPECT_TRUE(base::FundamentalValue(44).Equals(value)); | 237 EXPECT_TRUE(base::FundamentalValue(44).Equals(value)); |
| 236 EXPECT_TRUE(overlay_->GetValue(mapped_underlay_key, &value)); | 238 EXPECT_TRUE(overlay_->GetValue(mapped_underlay_key, &value)); |
| 237 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); | 239 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); |
| 238 EXPECT_TRUE(underlay_->GetValue(mapped_underlay_key, &value)); | 240 EXPECT_TRUE(underlay_->GetValue(mapped_underlay_key, &value)); |
| 239 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); | 241 EXPECT_TRUE(base::FundamentalValue(43).Equals(value)); |
| 240 | 242 |
| 241 // Check that hidden underlay change is not reported. | 243 // Check that hidden underlay change is not reported. |
| 242 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); | 244 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); |
| 243 underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(45)); | 245 underlay_->SetValue(mapped_underlay_key, new FundamentalValue(45)); |
| 244 Mock::VerifyAndClearExpectations(&obs); | 246 Mock::VerifyAndClearExpectations(&obs); |
| 245 | 247 |
| 246 // Check that overlay remove is reported. | 248 // Check that overlay remove is reported. |
| 247 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); | 249 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); |
| 248 overlay_->RemoveValue(mapped_overlay_key); | 250 overlay_->RemoveValue(mapped_overlay_key); |
| 249 Mock::VerifyAndClearExpectations(&obs); | 251 Mock::VerifyAndClearExpectations(&obs); |
| 250 | 252 |
| 251 // Check that underlay remove is reported. | 253 // Check that underlay remove is reported. |
| 252 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); | 254 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1); |
| 253 underlay_->RemoveValue(mapped_underlay_key); | 255 underlay_->RemoveValue(mapped_underlay_key); |
| 254 Mock::VerifyAndClearExpectations(&obs); | 256 Mock::VerifyAndClearExpectations(&obs); |
| 255 | 257 |
| 256 // Check that value was removed. | 258 // Check that value was removed. |
| 257 EXPECT_FALSE(overlay_->GetValue(mapped_overlay_key, &value)); | 259 EXPECT_FALSE(overlay_->GetValue(mapped_overlay_key, &value)); |
| 258 EXPECT_FALSE(overlay_->GetValue(mapped_underlay_key, &value)); | 260 EXPECT_FALSE(overlay_->GetValue(mapped_underlay_key, &value)); |
| 259 | 261 |
| 260 // Check respecting of silence. | 262 // Check respecting of silence. |
| 261 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); | 263 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); |
| 262 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0); | 264 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0); |
| 263 overlay_->SetValueSilently(mapped_overlay_key, Value::CreateIntegerValue(46)); | 265 overlay_->SetValueSilently(mapped_overlay_key, new FundamentalValue(46)); |
| 264 Mock::VerifyAndClearExpectations(&obs); | 266 Mock::VerifyAndClearExpectations(&obs); |
| 265 | 267 |
| 266 overlay_->RemoveObserver(&obs); | 268 overlay_->RemoveObserver(&obs); |
| 267 | 269 |
| 268 // Check successful unsubscription. | 270 // Check successful unsubscription. |
| 269 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); | 271 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); |
| 270 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0); | 272 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0); |
| 271 underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(47)); | 273 underlay_->SetValue(mapped_underlay_key, new FundamentalValue(47)); |
| 272 overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(48)); | 274 overlay_->SetValue(mapped_overlay_key, new FundamentalValue(48)); |
| 273 Mock::VerifyAndClearExpectations(&obs); | 275 Mock::VerifyAndClearExpectations(&obs); |
| 274 } | 276 } |
| 277 |
| 278 } // namespace base |
| OLD | NEW |