more changes

chrome/browser/policy/config_dir_policy_provider_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 <algorithm>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
@@ skipping 120 matching lines @@
   }
 
   ConfigurationPolicyType type() const { return type_; }
   const char* policy_key() const { return policy_key_; }
   const Value* test_value() const { return test_value_.get(); }
 
   // Factory methods that create parameter objects for different value types.
   static ValueTestParams ForStringPolicy(
       ConfigurationPolicyType type,
       const char* policy_key) {
-    return ValueTestParams(type, policy_key, Value::CreateStringValue("test"));
+    return ValueTestParams(type, policy_key, base::StringValue::New("test"));
   }
   static ValueTestParams ForBooleanPolicy(
       ConfigurationPolicyType type,
       const char* policy_key) {
-    return ValueTestParams(type, policy_key, Value::CreateBooleanValue(true));
+    return ValueTestParams(type, policy_key, base::TrueValue());
   }
   static ValueTestParams ForIntegerPolicy(
       ConfigurationPolicyType type,
       const char* policy_key) {
-    return ValueTestParams(type, policy_key, Value::CreateIntegerValue(42));
+    return ValueTestParams(type, policy_key, base::NumberValue::New(42));
   }
   static ValueTestParams ForListPolicy(
       ConfigurationPolicyType type,
       const char* policy_key) {
     ListValue* value = new ListValue();
-    value->Set(0U, Value::CreateStringValue("first"));
-    value->Set(1U, Value::CreateStringValue("second"));
+    value->Set(0U, base::StringValue::New("first"));
+    value->Set(1U, base::StringValue::New("second"));
     return ValueTestParams(type, policy_key, value);
   }
 
  private:
   ConfigurationPolicyType type_;
   const char* policy_key_;
   scoped_ptr<Value> test_value_;
 };
 
 // Tests whether the provider correctly reads a value from the file and forwards
@@ skipping 21 matching lines @@
 TEST_P(ConfigDirPolicyProviderValueTest, Default) {
   ConfigDirPolicyProvider provider(
       ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
       test_dir());
   EXPECT_TRUE(provider.Provide(&policy_store_));
   EXPECT_TRUE(policy_store_.policy_map().empty());
 }
 
 TEST_P(ConfigDirPolicyProviderValueTest, NullValue) {
   DictionaryValue dict;
-  dict.Set(GetParam().policy_key(), Value::CreateNullValue());
+  dict.Set(GetParam().policy_key(), base::NullValue());
   WriteConfigFile(dict, "empty");
   ConfigDirPolicyProvider provider(
       ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
       test_dir());
   EXPECT_TRUE(provider.Provide(&policy_store_));
   EXPECT_TRUE(policy_store_.policy_map().empty());
 }
 
 TEST_P(ConfigDirPolicyProviderValueTest, TestValue) {
   DictionaryValue dict;
@@ skipping 159 matching lines @@
             kPolicyEditBookmarksEnabled,
             key::kEditBookmarksEnabled),
         ValueTestParams::ForListPolicy(
             kPolicyDisabledSchemes,
             key::kDisabledSchemes),
         ValueTestParams::ForStringPolicy(
             kPolicyDiskCacheDir,
             key::kDiskCacheDir)));
 
 }  // namespace policy