base: Do not use Value::Create* functions.

BUG=160586
R=willchan@chromium.org,estade@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11519026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173368 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 18 insertions, 19 deletions

diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
index 02295de..4c03a98 100644
--- a/base/json/json_parser.cc
+++ b/base/json/json_parser.cc
@@ -148,7 +148,7 @@ class JSONStringValue : public base::Value {
     return true;
   }
   virtual Value* DeepCopy() const OVERRIDE {
-    return Value::CreateStringValue(string_piece_.as_string());
+    return new StringValue(string_piece_.as_string());
   }
   virtual bool Equals(const Value* other) const OVERRIDE {
     std::string other_string;
@@ -865,12 +865,12 @@ Value* JSONParser::ConsumeNumber() {
 
   int num_int;
   if (StringToInt(num_string, &num_int))
-    return Value::CreateIntegerValue(num_int);
+    return new FundamentalValue(num_int);
 
   double num_double;
   if (base::StringToDouble(num_string.as_string(), &num_double) &&
       IsFinite(num_double)) {
-    return Value::CreateDoubleValue(num_double);
+    return new FundamentalValue(num_double);
   }
 
   return NULL;
@@ -906,7 +906,7 @@ Value* JSONParser::ConsumeLiteral() {
         return NULL;
       }
       NextNChars(kTrueLen - 1);
-      return Value::CreateBooleanValue(true);
+      return new FundamentalValue(true);
     }
     case 'f': {
       const char* kFalseLiteral = "false";
@@ -917,7 +917,7 @@ Value* JSONParser::ConsumeLiteral() {
         return NULL;
       }
       NextNChars(kFalseLen - 1);
-      return Value::CreateBooleanValue(false);
+      return new FundamentalValue(false);
     }
     case 'n': {
       const char* kNullLiteral = "null";
diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index c52a1df4..7ddd7b4 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc
@@ -29,19 +29,19 @@ TEST(JSONWriterTest, Writing) {
   delete root;
 
   // Test Real values should always have a decimal or an 'e'.
-  root = Value::CreateDoubleValue(1.0);
+  root = new FundamentalValue(1.0);
   JSONWriter::Write(root, &output_js);
   ASSERT_EQ("1.0", output_js);
   delete root;
 
   // Test Real values in the the range (-1, 1) must have leading zeros
-  root = Value::CreateDoubleValue(0.2);
+  root = new FundamentalValue(0.2);
   JSONWriter::Write(root, &output_js);
   ASSERT_EQ("0.2", output_js);
   delete root;
 
   // Test Real values in the the range (-1, 1) must have leading zeros
-  root = Value::CreateDoubleValue(-0.8);
+  root = new FundamentalValue(-0.8);
   JSONWriter::Write(root, &output_js);
   ASSERT_EQ("-0.8", output_js);
   delete root;
@@ -56,7 +56,7 @@ TEST(JSONWriterTest, Writing) {
   inner_dict->SetInteger("inner int", 10);
   ListValue* inner_list = new ListValue;
   list->Append(inner_list);
-  list->Append(Value::CreateBooleanValue(true));
+  list->Append(new FundamentalValue(true));
 
   // Test the pretty-printer.
   JSONWriter::Write(&root_dict, &output_js);
@@ -80,18 +80,17 @@ TEST(JSONWriterTest, Writing) {
 
   // Test keys with periods
   DictionaryValue period_dict;
-  period_dict.SetWithoutPathExpansion("a.b", Value::CreateIntegerValue(3));
-  period_dict.SetWithoutPathExpansion("c", Value::CreateIntegerValue(2));
+  period_dict.SetWithoutPathExpansion("a.b", new FundamentalValue(3));
+  period_dict.SetWithoutPathExpansion("c", new FundamentalValue(2));
   DictionaryValue* period_dict2 = new DictionaryValue;
-  period_dict2->SetWithoutPathExpansion("g.h.i.j",
-                                        Value::CreateIntegerValue(1));
+  period_dict2->SetWithoutPathExpansion("g.h.i.j", new FundamentalValue(1));
   period_dict.SetWithoutPathExpansion("d.e.f", period_dict2);
   JSONWriter::Write(&period_dict, &output_js);
   ASSERT_EQ("{\"a.b\":3,\"c\":2,\"d.e.f\":{\"g.h.i.j\":1}}", output_js);
 
   DictionaryValue period_dict3;
-  period_dict3.Set("a.b", Value::CreateIntegerValue(2));
-  period_dict3.SetWithoutPathExpansion("a.b", Value::CreateIntegerValue(1));
+  period_dict3.Set("a.b", new FundamentalValue(2));
+  period_dict3.SetWithoutPathExpansion("a.b", new FundamentalValue(1));
   JSONWriter::Write(&period_dict3, &output_js);
   ASSERT_EQ("{\"a\":{\"b\":2},\"a.b\":1}", output_js);
 
@@ -103,18 +102,18 @@ TEST(JSONWriterTest, Writing) {
   delete root;
 
   ListValue binary_list;
-  binary_list.Append(Value::CreateIntegerValue(5));
+  binary_list.Append(new FundamentalValue(5));
   binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
-  binary_list.Append(Value::CreateIntegerValue(2));
+  binary_list.Append(new FundamentalValue(2));
   JSONWriter::WriteWithOptions(&binary_list,
                                JSONWriter::OPTIONS_OMIT_BINARY_VALUES,
                                &output_js);
   ASSERT_EQ("[5,2]", output_js);
 
   DictionaryValue binary_dict;
-  binary_dict.Set("a", Value::CreateIntegerValue(5));
+  binary_dict.Set("a", new FundamentalValue(5));
   binary_dict.Set("b", BinaryValue::CreateWithCopiedBuffer("asdf", 4));
-  binary_dict.Set("c", Value::CreateIntegerValue(2));
+  binary_dict.Set("c", new FundamentalValue(2));
   JSONWriter::WriteWithOptions(&binary_dict,
                                JSONWriter::OPTIONS_OMIT_BINARY_VALUES,
                                &output_js);