Refactor extension event distribution to use Values instead of JSON strings.

chrome/browser/extensions/api/app/app_api.cc

Index: chrome/browser/extensions/api/app/app_api.cc
diff --git a/chrome/browser/extensions/api/app/app_api.cc b/chrome/browser/extensions/api/app/app_api.cc
index 611ac85edb74526ac6ef8bc6a244434fd5be4fcb..fd649e25c7cf0d036991c30bd576746f7727f673 100644
--- a/chrome/browser/extensions/api/app/app_api.cc
+++ b/chrome/browser/extensions/api/app/app_api.cc
@@ -122,49 +122,47 @@ bool AppClearAllNotificationsFunction::RunImpl() {
 void AppEventRouter::DispatchOnLaunchedEvent(
     Profile* profile, const Extension* extension) {
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
-      extension->id(), kOnLaunchedEvent, "[]", NULL, GURL());
+      extension->id(), kOnLaunchedEvent, NULL, NULL, GURL());
 }
 
 // static.
 void AppEventRouter::DispatchOnLaunchedEventWithFileEntry(
     Profile* profile, const Extension* extension, const string16& action,
     const std::string& file_system_id, const FilePath& base_name) {
-  ListValue args;
+  ListValue* args = new ListValue();
   DictionaryValue* launch_data = new DictionaryValue();
   DictionaryValue* intent = new DictionaryValue();
   intent->SetString("action", UTF16ToUTF8(action));
   intent->SetString("type", "chrome-extension://fileentry");
   launch_data->Set("intent", intent);
-  args.Append(launch_data);
+  args->Append(launch_data);
   DictionaryValue* intent_data = new DictionaryValue();
   intent_data->SetString("format", "fileEntry");
   intent_data->SetString("fileSystemId", file_system_id);
   intent_data->SetString("baseName", base_name.value());
-  args.Append(intent_data);
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
+  args->Append(intent_data);
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
-      extension->id(), kOnLaunchedEvent, json_args, NULL, GURL());
+      extension->id(), kOnLaunchedEvent, args, NULL, GURL());
 }
 
 // static.
 void AppEventRouter::DispatchOnLaunchedEventWithWebIntent(
     Profile* profile, const Extension* extension,
     const webkit_glue::WebIntentData web_intent_data) {
-  ListValue args;
+  ListValue* args = new ListValue();
   DictionaryValue* launch_data = new DictionaryValue();
   DictionaryValue* intent = new DictionaryValue();
   intent->SetString("action", UTF16ToUTF8(web_intent_data.action));
   intent->SetString("type", UTF16ToUTF8(web_intent_data.type));
   launch_data->Set("intent", intent);
-  args.Append(launch_data);
+  args->Append(launch_data);
   DictionaryValue* intent_data;
   switch (web_intent_data.data_type) {
     case webkit_glue::WebIntentData::SERIALIZED:
       intent_data = new DictionaryValue();
       intent_data->SetString("format", "serialized");
       intent_data->SetString("data", UTF16ToUTF8(web_intent_data.data));
-      args.Append(intent_data);
+      args->Append(intent_data);
       break;
     case webkit_glue::WebIntentData::UNSERIALIZED:
       intent->SetString("data", UTF16ToUTF8(web_intent_data.unserialized_data));
@@ -175,16 +173,14 @@ void AppEventRouter::DispatchOnLaunchedEventWithWebIntent(
       intent_data->SetString("blobFileName", web_intent_data.blob_file.value());
       intent_data->SetString("blobLength",
                              base::Int64ToString(web_intent_data.blob_length));
-      args.Append(intent_data);
+      args->Append(intent_data);
       break;
     default:
       NOTREACHED();
       break;
   }
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
-      extension->id(), kOnLaunchedEvent, json_args, NULL, GURL());
+      extension->id(), kOnLaunchedEvent, args, NULL, GURL());
 }
 
 }  // namespace extensions