more changes

chrome/browser/extensions/extension_message_service.cc

Index: chrome/browser/extensions/extension_message_service.cc
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 58400e5e9037edb95762d5ec655f5eec45958f2f..a1b769da5cecb4c2454451f47150003a59a11fc1 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -64,11 +64,11 @@ static void DispatchOnConnect(const ExtensionMessageService::MessagePort& port,
                               const std::string& source_extension_id,
                               const std::string& target_extension_id) {
   ListValue args;
-  args.Set(0, Value::CreateIntegerValue(dest_port_id));
-  args.Set(1, Value::CreateStringValue(channel_name));
-  args.Set(2, Value::CreateStringValue(tab_json));
-  args.Set(3, Value::CreateStringValue(source_extension_id));
-  args.Set(4, Value::CreateStringValue(target_extension_id));
+  args.Set(0, base::NumberValue::New(dest_port_id));
+  args.Set(1, base::StringValue::New(channel_name));
+  args.Set(2, base::StringValue::New(tab_json));
+  args.Set(3, base::StringValue::New(source_extension_id));
+  args.Set(4, base::StringValue::New(target_extension_id));
   CHECK(port.sender);
   port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id,
        "", ExtensionMessageService::kDispatchOnConnect, args, GURL()));
@@ -78,8 +78,8 @@ static void DispatchOnDisconnect(
     const ExtensionMessageService::MessagePort& port, int source_port_id,
     bool connection_error) {
   ListValue args;
-  args.Set(0, Value::CreateIntegerValue(source_port_id));
-  args.Set(1, Value::CreateBooleanValue(connection_error));
+  args.Set(0, base::NumberValue::New(source_port_id));
+  args.Set(1, base::BooleanValue::New(connection_error));
   port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id,
       "", ExtensionMessageService::kDispatchOnDisconnect, args, GURL()));
 }
@@ -87,8 +87,8 @@ static void DispatchOnDisconnect(
 static void DispatchOnMessage(const ExtensionMessageService::MessagePort& port,
                               const std::string& message, int source_port_id) {
   ListValue args;
-  args.Set(0, Value::CreateStringValue(message));
-  args.Set(1, Value::CreateIntegerValue(source_port_id));
+  args.Set(0, base::StringValue::New(message));
+  args.Set(1, base::NumberValue::New(source_port_id));
   port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id,
       "", ExtensionMessageService::kDispatchOnMessage, args, GURL()));
 }