base: Add three helper functions to Values API.

chrome/browser/prefs/pref_model_associator_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/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process_test.h"
@@ skipping 76 matching lines @@
 TEST_F(ListPreferenceMergeTest, LocalEmpty) {
   SetPrefToEmpty(prefs::kURLsToRestoreOnStartup);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<Value> merged_value(
       PrefModelAssociator::MergePreference(*pref, server_url_list_));
   EXPECT_TRUE(merged_value->Equals(&server_url_list_));
 }
 
 TEST_F(ListPreferenceMergeTest, ServerNull) {
-  scoped_ptr<Value> null_value(Value::CreateNullValue());
+  scoped_ptr<Value> null_value(base::NullValue());
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     ListValue* local_list_value = update.Get();
     local_list_value->Append(Value::CreateStringValue(local_url0_));
   }
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<Value> merged_value(
       PrefModelAssociator::MergePreference(*pref, *null_value));
@@ skipping 104 matching lines @@
 TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) {
   SetPrefToEmpty(prefs::kContentSettingsPatterns);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kContentSettingsPatterns);
   scoped_ptr<Value> merged_value(
       PrefModelAssociator::MergePreference(*pref, server_patterns_));
   EXPECT_TRUE(merged_value->Equals(&server_patterns_));
 }
 
 TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
-  scoped_ptr<Value> null_value(Value::CreateNullValue());
+  scoped_ptr<Value> null_value(base::NullValue());
   {
     DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatterns);
     DictionaryValue* local_dict_value = update.Get();
     SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
   }
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kContentSettingsPatterns);
   scoped_ptr<Value> merged_value(
       PrefModelAssociator::MergePreference(*pref, *null_value));
@@ skipping 161 matching lines @@
   EXPECT_TRUE(MergeListPreference(prefs::kDesktopNotificationDeniedOrigins));
 }
 
 TEST_F(IndividualPreferenceMergeTest, ContentSettingsPatterns) {
   EXPECT_TRUE(MergeDictionaryPreference(prefs::kContentSettingsPatterns));
 }
 
 TEST_F(IndividualPreferenceMergeTest, GeolocationContentSettings) {
   EXPECT_TRUE(MergeDictionaryPreference(prefs::kGeolocationContentSettings));
 }