Cleanup: Remove deprecated base::Value methods from contents. Use base::Value too.

content/common/common_param_traits_unittest.cc

 // Copyright (c) 2012 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 <string.h>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "content/public/common/common_param_traits.h"
@@ skipping 60 matching lines @@
 
   TestPair input("foo", "bar");
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<TestPair>::Write(&msg, input);
 
   TestPair output;
   PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ParamTraits<TestPair>::Read(&msg, &iter, &output));
   EXPECT_EQ(output.first, "foo");
   EXPECT_EQ(output.second, "bar");
-
 }
 
 // Tests bitmap serialization.
 TEST(IPCMessageTest, Bitmap) {
   SkBitmap bitmap;
 
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 5);
   bitmap.allocPixels();
   memset(bitmap.getPixels(), 'A', bitmap.getSize());
 
@@ skipping 25 matching lines @@
   scoped_array<char> bogus_pixels(new char[bogus_pixels_size]);
   memset(bogus_pixels.get(), 'B', bogus_pixels_size);
   bad_msg.WriteData(bogus_pixels.get(), bogus_pixels_size);
   // Make sure we don't read out the bitmap!
   SkBitmap bad_output;
   iter = PickleIterator(bad_msg);
   EXPECT_FALSE(IPC::ParamTraits<SkBitmap>::Read(&bad_msg, &iter, &bad_output));
 }
 
 TEST(IPCMessageTest, ListValue) {
-  ListValue input;
-  input.Set(0, Value::CreateDoubleValue(42.42));
-  input.Set(1, Value::CreateStringValue("forty"));
-  input.Set(2, Value::CreateNullValue());
+  base::ListValue input;
+  input.Set(0, new base::FundamentalValue(42.42));
+  input.Set(1, new base::StringValue("forty"));
+  input.Set(2, base::Value::CreateNullValue());
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::WriteParam(&msg, input);
 
-  ListValue output;
+  base::ListValue output;
   PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ReadParam(&msg, &iter, &output));
 
   EXPECT_TRUE(input.Equals(&output));
 
   // Also test the corrupt case.
   IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   bad_msg.WriteInt(99);
   iter = PickleIterator(bad_msg);
   EXPECT_FALSE(IPC::ReadParam(&bad_msg, &iter, &output));
 }
 
 TEST(IPCMessageTest, DictionaryValue) {
-  DictionaryValue input;
-  input.Set("null", Value::CreateNullValue());
-  input.Set("bool", Value::CreateBooleanValue(true));
-  input.Set("int", Value::CreateIntegerValue(42));
+  base::DictionaryValue input;
+  input.Set("null", base::Value::CreateNullValue());
+  input.Set("bool", new base::FundamentalValue(true));
+  input.Set("int", new base::FundamentalValue(42));
 
-  scoped_ptr<DictionaryValue> subdict(new DictionaryValue());
-  subdict->Set("str", Value::CreateStringValue("forty two"));
-  subdict->Set("bool", Value::CreateBooleanValue(false));
+  scoped_ptr<base::DictionaryValue> subdict(new base::DictionaryValue());
+  subdict->Set("str", new base::StringValue("forty two"));
+  subdict->Set("bool", new base::FundamentalValue(false));
 
-  scoped_ptr<ListValue> sublist(new ListValue());
-  sublist->Set(0, Value::CreateDoubleValue(42.42));
-  sublist->Set(1, Value::CreateStringValue("forty"));
-  sublist->Set(2, Value::CreateStringValue("two"));
+  scoped_ptr<base::ListValue> sublist(new base::ListValue());
+  sublist->Set(0, new base::FundamentalValue(42.42));
+  sublist->Set(1, new base::StringValue("forty"));
+  sublist->Set(2, new base::StringValue("two"));
   subdict->Set("list", sublist.release());
 
   input.Set("dict", subdict.release());
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::WriteParam(&msg, input);
 
-  DictionaryValue output;
+  base::DictionaryValue output;
   PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ReadParam(&msg, &iter, &output));
 
   EXPECT_TRUE(input.Equals(&output));
 
   // Also test the corrupt case.
   IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   bad_msg.WriteInt(99);
   iter = PickleIterator(bad_msg);
   EXPECT_FALSE(IPC::ReadParam(&bad_msg, &iter, &output));
 }
 
 // Tests net::HostPortPair serialization
 TEST(IPCMessageTest, HostPortPair) {
   net::HostPortPair input("host.com", 12345);
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<net::HostPortPair>::Write(&msg, input);
 
   net::HostPortPair output;
   PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ParamTraits<net::HostPortPair>::Read(&msg, &iter, &output));
   EXPECT_EQ(input.host(), output.host());
   EXPECT_EQ(input.port(), output.port());
 }