more changes

chrome/browser/prefs/incognito_user_pref_store_unittest.cc

Index: chrome/browser/prefs/incognito_user_pref_store_unittest.cc
diff --git a/chrome/browser/prefs/incognito_user_pref_store_unittest.cc b/chrome/browser/prefs/incognito_user_pref_store_unittest.cc
index 283ad1726a180f205cf1205bbabc674c1fee7f3b..30764d4081d25089b3bcaeb9cee722b3668ee094 100644
--- a/chrome/browser/prefs/incognito_user_pref_store_unittest.cc
+++ b/chrome/browser/prefs/incognito_user_pref_store_unittest.cc
@@ -39,22 +39,22 @@ TEST_F(IncognitoUserPrefStoreTest, Observer) {
 
   // Check that underlay first value is reported.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(1);
-  underlay_->SetValue(incognito_key, Value::CreateIntegerValue(42));
+  underlay_->SetValue(incognito_key, base::NumberValue::New(42));
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that underlay overwriting is reported.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(1);
-  underlay_->SetValue(incognito_key, Value::CreateIntegerValue(43));
+  underlay_->SetValue(incognito_key, base::NumberValue::New(43));
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that overwriting change in overlay is reported.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(1);
-  overlay_->SetValue(incognito_key, Value::CreateIntegerValue(44));
+  overlay_->SetValue(incognito_key, base::NumberValue::New(44));
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that hidden underlay change is not reported.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(0);
-  underlay_->SetValue(incognito_key, Value::CreateIntegerValue(45));
+  underlay_->SetValue(incognito_key, base::NumberValue::New(45));
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that overlay remove is reported.
@@ -69,15 +69,15 @@ TEST_F(IncognitoUserPrefStoreTest, Observer) {
 
   // Check respecting of silence.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(0);
-  overlay_->SetValueSilently(incognito_key, Value::CreateIntegerValue(46));
+  overlay_->SetValueSilently(incognito_key, base::NumberValue::New(46));
   Mock::VerifyAndClearExpectations(&obs);
 
   overlay_->RemoveObserver(&obs);
 
   // Check successful unsubscription.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(0);
-  underlay_->SetValue(incognito_key, Value::CreateIntegerValue(47));
-  overlay_->SetValue(incognito_key, Value::CreateIntegerValue(48));
+  underlay_->SetValue(incognito_key, base::NumberValue::New(47));
+  overlay_->SetValue(incognito_key, base::NumberValue::New(48));
   Mock::VerifyAndClearExpectations(&obs);
 }
 
@@ -89,7 +89,7 @@ TEST_F(IncognitoUserPrefStoreTest, GetAndSet) {
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             underlay_->GetValue(incognito_key, &value));
 
-  underlay_->SetValue(incognito_key, Value::CreateIntegerValue(42));
+  underlay_->SetValue(incognito_key, base::NumberValue::New(42));
 
   // Value shines through:
   EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(incognito_key, &value));
@@ -102,7 +102,7 @@ TEST_F(IncognitoUserPrefStoreTest, GetAndSet) {
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(42, i);
 
-  overlay_->SetValue(incognito_key, Value::CreateIntegerValue(43));
+  overlay_->SetValue(incognito_key, base::NumberValue::New(43));
 
   EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(incognito_key, &value));
   ASSERT_TRUE(value);
@@ -164,12 +164,12 @@ TEST_F(IncognitoUserPrefStoreTest, 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, base::NumberValue::New(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, base::NumberValue::New(43));
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that we get this value from the overlay
@@ -180,7 +180,7 @@ TEST_F(IncognitoUserPrefStoreTest, 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, base::NumberValue::New(44));
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that we get this value from the overlay and the underlay.
@@ -204,14 +204,14 @@ TEST_F(IncognitoUserPrefStoreTest, 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, base::NumberValue::New(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, base::NumberValue::New(47));
+  overlay_->SetValue(regular_key, base::NumberValue::New(48));
   Mock::VerifyAndClearExpectations(&obs);
 }