Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/values.h" | 5 #include "base/values.h" |
| 6 #include "chrome/browser/prefs/overlay_user_pref_store.h" | 6 #include "chrome/browser/prefs/overlay_user_pref_store.h" |
| 7 #include "chrome/browser/prefs/testing_pref_store.h" | 7 #include "chrome/browser/prefs/testing_pref_store.h" |
| 8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
| 9 #include "chrome/common/pref_store_observer_mock.h" | 9 #include "chrome/common/pref_store_observer_mock.h" |
| 10 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 12 |
| 13 using ::testing::Mock; | 13 using ::testing::Mock; |
| 14 using ::testing::StrEq; | 14 using ::testing::StrEq; |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 const char* overlay_key = prefs::kBrowserWindowPlacement; | 18 const char* overlay_key = prefs::kBrowserWindowPlacement; |
| 19 const char* regular_key = prefs::kShowBookmarkBar; | 19 const char* regular_key = prefs::kShowBookmarkBar; |
| 20 // There is no real-life sense in mapping these two properties, it for test | |
|
Mattias Nissler (ping if slow)
2011/11/28 15:04:16
s/it/it's/
mnaganov (inactive)
2011/11/28 15:20:06
Thanks, but this text is being removed :)
| |
| 21 // purposes only. | |
| 22 const char* mapped_overlay_key = prefs::kWebKitJavascriptEnabled; | 20 const char* mapped_overlay_key = prefs::kWebKitJavascriptEnabled; |
| 23 const char* mapped_underlay_key = prefs::kWebKitJavaEnabled; | 21 const char* mapped_underlay_key = prefs::kWebKitGlobalJavascriptEnabled; |
| 24 | 22 |
| 25 } // namespace | 23 } // namespace |
| 26 | 24 |
| 27 class OverlayUserPrefStoreTest : public testing::Test { | 25 class OverlayUserPrefStoreTest : public testing::Test { |
| 28 protected: | 26 protected: |
| 29 OverlayUserPrefStoreTest() | 27 OverlayUserPrefStoreTest() |
| 30 : underlay_(new TestingPrefStore()), | 28 : underlay_(new TestingPrefStore()), |
| 31 overlay_(new OverlayUserPrefStore(underlay_.get())) { | 29 overlay_(new OverlayUserPrefStore(underlay_.get())) { |
| 32 overlay_->RegisterOverlayProperty(overlay_key); | 30 overlay_->RegisterOverlayProperty(overlay_key); |
| 33 overlay_->RegisterOverlayProperty(mapped_overlay_key, mapped_underlay_key); | 31 overlay_->RegisterOverlayProperty(mapped_overlay_key, mapped_underlay_key); |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 273 | 271 |
| 274 overlay_->RemoveObserver(&obs); | 272 overlay_->RemoveObserver(&obs); |
| 275 | 273 |
| 276 // Check successful unsubscription. | 274 // Check successful unsubscription. |
| 277 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); | 275 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0); |
| 278 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0); | 276 EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0); |
| 279 underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(47)); | 277 underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(47)); |
| 280 overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(48)); | 278 overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(48)); |
| 281 Mock::VerifyAndClearExpectations(&obs); | 279 Mock::VerifyAndClearExpectations(&obs); |
| 282 } | 280 } |
| OLD | NEW |