more changes

chrome/browser/extensions/extension_browser_event_router.cc

Index: chrome/browser/extensions/extension_browser_event_router.cc
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index 976c251b6e440a19542ae9e177bd67967d79a4db..88c5cf76b5dbe61303b09613c29d889293e83c64 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -218,7 +218,7 @@ void ExtensionBrowserEventRouter::OnBrowserSetLastActive(
   focused_window_id_ = window_id;
 
   ListValue real_args;
-  real_args.Append(Value::CreateIntegerValue(window_id));
+  real_args.Append(base::NumberValue::New(window_id));
   std::string real_json_args;
   base::JSONWriter::Write(&real_args, false, &real_json_args);
 
@@ -231,7 +231,7 @@ void ExtensionBrowserEventRouter::OnBrowserSetLastActive(
       focused_profile_ != previous_focused_profile) {
     ListValue none_args;
     none_args.Append(
-        Value::CreateIntegerValue(extension_misc::kUnknownWindowId));
+        base::NumberValue::New(extension_misc::kUnknownWindowId));
     base::JSONWriter::Write(&none_args, false, &none_json_args);
   }
 
@@ -264,12 +264,12 @@ void ExtensionBrowserEventRouter::TabInsertedAt(TabContentsWrapper* contents,
   }
 
   ListValue args;
-  args.Append(Value::CreateIntegerValue(tab_id));
+  args.Append(base::NumberValue::New(tab_id));
 
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->Set(tab_keys::kNewWindowIdKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kNewWindowIdKey, base::NumberValue::New(
       ExtensionTabUtil::GetWindowIdOfTab(contents->tab_contents())));
-  object_args->Set(tab_keys::kNewPositionKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kNewPositionKey, base::NumberValue::New(
       index));
   args.Append(object_args);
 
@@ -287,13 +287,13 @@ void ExtensionBrowserEventRouter::TabDetachedAt(TabContentsWrapper* contents,
   }
 
   ListValue args;
-  args.Append(Value::CreateIntegerValue(
+  args.Append(base::NumberValue::New(
       ExtensionTabUtil::GetTabId(contents->tab_contents())));
 
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->Set(tab_keys::kOldWindowIdKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kOldWindowIdKey, base::NumberValue::New(
       ExtensionTabUtil::GetWindowIdOfTab(contents->tab_contents())));
-  object_args->Set(tab_keys::kOldPositionKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kOldPositionKey, base::NumberValue::New(
       index));
   args.Append(object_args);
 
@@ -309,7 +309,7 @@ void ExtensionBrowserEventRouter::TabClosingAt(TabStripModel* tab_strip_model,
   int tab_id = ExtensionTabUtil::GetTabId(contents->tab_contents());
 
   ListValue args;
-  args.Append(Value::CreateIntegerValue(tab_id));
+  args.Append(base::NumberValue::New(tab_id));
 
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetBoolean(tab_keys::kWindowClosing,
@@ -333,11 +333,11 @@ void ExtensionBrowserEventRouter::ActiveTabChanged(
     int index,
     bool user_gesture) {
   ListValue args;
-  args.Append(Value::CreateIntegerValue(
+  args.Append(base::NumberValue::New(
       ExtensionTabUtil::GetTabId(new_contents->tab_contents())));
 
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->Set(tab_keys::kWindowIdKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kWindowIdKey, base::NumberValue::New(
       ExtensionTabUtil::GetWindowIdOfTab(new_contents->tab_contents())));
   args.Append(object_args);
 
@@ -352,15 +352,15 @@ void ExtensionBrowserEventRouter::TabMoved(TabContentsWrapper* contents,
                                            int from_index,
                                            int to_index) {
   ListValue args;
-  args.Append(Value::CreateIntegerValue(
+  args.Append(base::NumberValue::New(
       ExtensionTabUtil::GetTabId(contents->tab_contents())));
 
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->Set(tab_keys::kWindowIdKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kWindowIdKey, base::NumberValue::New(
       ExtensionTabUtil::GetWindowIdOfTab(contents->tab_contents())));
-  object_args->Set(tab_keys::kFromIndexKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kFromIndexKey, base::NumberValue::New(
       from_index));
-  object_args->Set(tab_keys::kToIndexKey, Value::CreateIntegerValue(
+  object_args->Set(tab_keys::kToIndexKey, base::NumberValue::New(
       to_index));
   args.Append(object_args);
 
@@ -447,7 +447,7 @@ void ExtensionBrowserEventRouter::DispatchSimpleBrowserEvent(
     return;
 
   ListValue args;
-  args.Append(Value::CreateIntegerValue(window_id));
+  args.Append(base::NumberValue::New(window_id));
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
@@ -465,7 +465,7 @@ void ExtensionBrowserEventRouter::DispatchTabUpdatedEvent(
   ListValue args;
 
   // First arg: The id of the tab that changed.
-  args.Append(Value::CreateIntegerValue(ExtensionTabUtil::GetTabId(contents)));
+  args.Append(base::NumberValue::New(ExtensionTabUtil::GetTabId(contents)));
 
   // Second arg: An object containing the changes to the tab state.
   args.Append(changed_properties);
@@ -555,12 +555,12 @@ void ExtensionBrowserEventRouter::DispatchOldPageActionEvent(
     const std::string& url,
     int button) {
   ListValue args;
-  args.Append(Value::CreateStringValue(page_action_id));
+  args.Append(base::StringValue::New(page_action_id));
 
   DictionaryValue* data = new DictionaryValue();
-  data->Set(tab_keys::kTabIdKey, Value::CreateIntegerValue(tab_id));
-  data->Set(tab_keys::kTabUrlKey, Value::CreateStringValue(url));
-  data->Set(page_action_keys::kButtonKey, Value::CreateIntegerValue(button));
+  data->Set(tab_keys::kTabIdKey, base::NumberValue::New(tab_id));
+  data->Set(tab_keys::kTabUrlKey, base::StringValue::New(url));
+  data->Set(page_action_keys::kButtonKey, base::NumberValue::New(button));
   args.Append(data);
 
   std::string json_args;