more changes

chrome/browser/prefs/incognito_user_pref_store_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/values.h"
 #include "chrome/browser/prefs/incognito_user_pref_store.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_store_observer_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 21 matching lines @@
   scoped_refptr<TestingPrefStore> underlay_;
   scoped_refptr<IncognitoUserPrefStore> overlay_;
 };
 
 TEST_F(IncognitoUserPrefStoreTest, Observer) {
   PrefStoreObserverMock obs;
   overlay_->AddObserver(&obs);
 
   // 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.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(1);
   overlay_->RemoveValue(incognito_key);
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that underlay remove is reported.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(incognito_key))).Times(1);
   underlay_->RemoveValue(incognito_key);
   Mock::VerifyAndClearExpectations(&obs);
 
   // 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);
 }
 
 TEST_F(IncognitoUserPrefStoreTest, GetAndSet) {
   const Value* value = NULL;
   int i = -1;
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
             overlay_->GetValue(incognito_key, &value));
   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));
   ASSERT_TRUE(value);
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(42, i);
 
   EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(incognito_key, &value));
   ASSERT_TRUE(value);
   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);
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(43, i);
 
   EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(incognito_key, &value));
   ASSERT_TRUE(value);
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(42, i);
@@ skipping 41 matching lines @@
 // Here we consider a global preference that is not incognito specific.
 TEST_F(IncognitoUserPrefStoreTest, GlobalPref) {
   PrefStoreObserverMock obs;
   overlay_->AddObserver(&obs);
 
   const Value* value = NULL;
   int i = -1;
 
   // 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
   EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(regular_key, &value));
   ASSERT_TRUE(value);
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(43, i);
 
   // 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.
   EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(regular_key, &value));
   ASSERT_TRUE(value);
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(44, i);
   EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(regular_key, &value));
   ASSERT_TRUE(value);
   EXPECT_TRUE(value->GetAsInteger(&i));
   EXPECT_EQ(44, i);
 
   // Check that overlay remove is reported.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
   overlay_->RemoveValue(regular_key);
   Mock::VerifyAndClearExpectations(&obs);
 
   // Check that value was removed from overlay and underlay
   EXPECT_EQ(PrefStore::READ_NO_VALUE, overlay_->GetValue(regular_key, &value));
   EXPECT_EQ(PrefStore::READ_NO_VALUE, underlay_->GetValue(regular_key, &value));
 
   // 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);
 }