Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2640)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/prefs/overlay_user_pref_store_unittest.cc

Issue 11519026: base: Do not use Value::Create* functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: scoped_ptr Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | base/prefs/pref_value_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/overlay_user_pref_store_unittest.cc
diff --git a/base/prefs/overlay_user_pref_store_unittest.cc b/base/prefs/overlay_user_pref_store_unittest.cc
index 80d35869ddf89736cd93b1121dac7923dd5129ff..c4e980bbae3e0c8b9877c6b265a64984c998930f 100644
--- a/base/prefs/overlay_user_pref_store_unittest.cc
+++ b/base/prefs/overlay_user_pref_store_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/prefs/overlay_user_pref_store.h"
+
#include "base/prefs/pref_store_observer_mock.h"
#include "base/prefs/testing_pref_store.h"
#include "base/values.h"
@@ -12,6 +13,7 @@
using ::testing::Mock;
using ::testing::StrEq;
+namespace base {
namespace {
const char kBrowserWindowPlacement[] = "browser.window_placement";
@@ -47,22 +49,22 @@ TEST_F(OverlayUserPrefStoreTest, Observer) {
// Check that underlay first value is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(42));
+ underlay_->SetValue(overlay_key, new FundamentalValue(42));
Mock::VerifyAndClearExpectations(&obs);
// Check that underlay overwriting is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(43));
+ underlay_->SetValue(overlay_key, new FundamentalValue(43));
Mock::VerifyAndClearExpectations(&obs);
// Check that overwriting change in overlay is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- overlay_->SetValue(overlay_key, Value::CreateIntegerValue(44));
+ overlay_->SetValue(overlay_key, new FundamentalValue(44));
Mock::VerifyAndClearExpectations(&obs);
// Check that hidden underlay change is not reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(45));
+ underlay_->SetValue(overlay_key, new FundamentalValue(45));
Mock::VerifyAndClearExpectations(&obs);
// Check that overlay remove is reported.
@@ -77,15 +79,15 @@ TEST_F(OverlayUserPrefStoreTest, Observer) {
// Check respecting of silence.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0);
- overlay_->SetValueSilently(overlay_key, Value::CreateIntegerValue(46));
+ overlay_->SetValueSilently(overlay_key, new FundamentalValue(46));
Mock::VerifyAndClearExpectations(&obs);
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(47));
- overlay_->SetValue(overlay_key, Value::CreateIntegerValue(48));
+ underlay_->SetValue(overlay_key, new FundamentalValue(47));
+ overlay_->SetValue(overlay_key, new FundamentalValue(48));
Mock::VerifyAndClearExpectations(&obs);
}
@@ -94,7 +96,7 @@ TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
EXPECT_FALSE(overlay_->GetValue(overlay_key, &value));
EXPECT_FALSE(underlay_->GetValue(overlay_key, &value));
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(42));
+ underlay_->SetValue(overlay_key, new FundamentalValue(42));
// Value shines through:
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
@@ -103,7 +105,7 @@ TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
EXPECT_TRUE(underlay_->GetValue(overlay_key, &value));
EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
- overlay_->SetValue(overlay_key, Value::CreateIntegerValue(43));
+ overlay_->SetValue(overlay_key, new FundamentalValue(43));
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
@@ -153,12 +155,12 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
// Check that underlay first value is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- underlay_->SetValue(regular_key, Value::CreateIntegerValue(42));
+ underlay_->SetValue(regular_key, new FundamentalValue(42));
Mock::VerifyAndClearExpectations(&obs);
// Check that underlay overwriting is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- underlay_->SetValue(regular_key, Value::CreateIntegerValue(43));
+ underlay_->SetValue(regular_key, new FundamentalValue(43));
Mock::VerifyAndClearExpectations(&obs);
// Check that we get this value from the overlay
@@ -167,7 +169,7 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
// Check that overwriting change in overlay is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- overlay_->SetValue(regular_key, Value::CreateIntegerValue(44));
+ overlay_->SetValue(regular_key, new FundamentalValue(44));
Mock::VerifyAndClearExpectations(&obs);
// Check that we get this value from the overlay and the underlay.
@@ -187,15 +189,15 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
// Check respecting of silence.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0);
- overlay_->SetValueSilently(regular_key, Value::CreateIntegerValue(46));
+ overlay_->SetValueSilently(regular_key, new FundamentalValue(46));
Mock::VerifyAndClearExpectations(&obs);
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0);
- underlay_->SetValue(regular_key, Value::CreateIntegerValue(47));
- overlay_->SetValue(regular_key, Value::CreateIntegerValue(48));
+ underlay_->SetValue(regular_key, new FundamentalValue(47));
+ overlay_->SetValue(regular_key, new FundamentalValue(48));
Mock::VerifyAndClearExpectations(&obs);
}
@@ -209,12 +211,12 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that if there is no override in the overlay, changing underlay value
// is reported as changing an overlay value.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(42));
+ underlay_->SetValue(mapped_underlay_key, new FundamentalValue(42));
Mock::VerifyAndClearExpectations(&obs);
// Check that underlay overwriting is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(43));
+ underlay_->SetValue(mapped_underlay_key, new FundamentalValue(43));
Mock::VerifyAndClearExpectations(&obs);
// Check that we get this value from the overlay with both keys
@@ -226,7 +228,7 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that overwriting change in overlay is reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(44));
+ overlay_->SetValue(mapped_overlay_key, new FundamentalValue(44));
Mock::VerifyAndClearExpectations(&obs);
// Check that we get an overriden value from overlay, while reading the
@@ -240,7 +242,7 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that hidden underlay change is not reported.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(45));
+ underlay_->SetValue(mapped_underlay_key, new FundamentalValue(45));
Mock::VerifyAndClearExpectations(&obs);
// Check that overlay remove is reported.
@@ -260,7 +262,7 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check respecting of silence.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0);
- overlay_->SetValueSilently(mapped_overlay_key, Value::CreateIntegerValue(46));
+ overlay_->SetValueSilently(mapped_overlay_key, new FundamentalValue(46));
Mock::VerifyAndClearExpectations(&obs);
overlay_->RemoveObserver(&obs);
@@ -268,7 +270,9 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check successful unsubscription.
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(47));
- overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(48));
+ underlay_->SetValue(mapped_underlay_key, new FundamentalValue(47));
+ overlay_->SetValue(mapped_overlay_key, new FundamentalValue(48));
Mock::VerifyAndClearExpectations(&obs);
}
+
+} // namespace base
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | base/prefs/pref_value_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698