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

chrome/browser/extensions/menu_manager.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 "chrome/browser/extensions/menu_manager.h"
 
 #include <algorithm>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 565 matching lines @@
 
   // ExtensionService/Extension can be NULL in unit tests :(
   ExtensionService* service =
       ExtensionSystem::Get(profile_)->extension_service();
   const Extension* extension = service ?
       service->extensions()->GetByID(menu_item_id.extension_id) : NULL;
 
   if (item->type() == MenuItem::RADIO)
     RadioItemSelected(item);
 
-  ListValue args;
+  ListValue* args = new ListValue();
 
   DictionaryValue* properties = new DictionaryValue();
   SetIdKeyValue(properties, "menuItemId", item->id());
   if (item->parent_id())
     SetIdKeyValue(properties, "parentMenuItemId", item->id());
 
   switch (params.media_type) {
     case WebKit::WebContextMenuData::MediaTypeImage:
       properties->SetString("mediaType", "image");
       break;
     case WebKit::WebContextMenuData::MediaTypeVideo:
       properties->SetString("mediaType", "video");
       break;
     case WebKit::WebContextMenuData::MediaTypeAudio:
       properties->SetString("mediaType", "audio");
       break;
     default:  {}  // Do nothing.
   }
 
   AddURLProperty(properties, "linkUrl", params.unfiltered_link_url);
   AddURLProperty(properties, "srcUrl", params.src_url);
   AddURLProperty(properties, "pageUrl", params.page_url);
   AddURLProperty(properties, "frameUrl", params.frame_url);
 
   if (params.selection_text.length() > 0)
     properties->SetString("selectionText", params.selection_text);
 
   properties->SetBoolean("editable", params.is_editable);
 
-  args.Append(properties);
+  args->Append(properties);
 
   // Add the tab info to the argument list.
   // Note: web_contents only NULL in unit tests :(
   if (web_contents)
-    args.Append(ExtensionTabUtil::CreateTabValue(web_contents));
+    args->Append(ExtensionTabUtil::CreateTabValue(web_contents));
   else
-    args.Append(new DictionaryValue());
+    args->Append(new DictionaryValue());
 
   if (item->type() == MenuItem::CHECKBOX ||
       item->type() == MenuItem::RADIO) {
     bool was_checked = item->checked();
     properties->SetBoolean("wasChecked", was_checked);
 
     // RADIO items always get set to true when you click on them, but CHECKBOX
     // items get their state toggled.
     bool checked =
         (item->type() == MenuItem::RADIO) ? true : !was_checked;
 
     item->SetChecked(checked);
     properties->SetBoolean("checked", item->checked());
 
     if (extension)
       WriteToStorage(extension);
   }
 
   TabContents* tab_contents = web_contents ?
       TabContents::FromWebContents(web_contents) : NULL;
   if (tab_contents && extension) {
     tab_contents->extension_tab_helper()->active_tab_permission_manager()->
         GrantIfRequested(extension);
   }
 
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
   event_router->DispatchEventToExtension(
       item->extension_id(), extension_event_names::kOnContextMenus,
-      json_args, profile, GURL(),
-      ExtensionEventRouter::USER_GESTURE_ENABLED);
+      args, profile, GURL(), ExtensionEventRouter::USER_GESTURE_ENABLED);
   event_router->DispatchEventToExtension(
       item->extension_id(), extension_event_names::kOnContextMenuClicked,
-      json_args, profile, GURL(),
-      ExtensionEventRouter::USER_GESTURE_ENABLED);
+      args, profile, GURL(), ExtensionEventRouter::USER_GESTURE_ENABLED);

[miket_OOO, 2012/07/10 22:33:19]

I think args is dead by this point.

 }
 
 void MenuManager::SanitizeRadioList(const MenuItem::List& item_list) {
   MenuItem::List::const_iterator i = item_list.begin();
   while (i != item_list.end()) {
     if ((*i)->type() != MenuItem::RADIO) {
       ++i;
       break;
     }
 
@@ skipping 147 matching lines @@
       if (uid < other.uid)
         return true;
       if (uid == other.uid)
         return string_uid < other.string_uid;
     }
   }
   return false;
 }
 
 }  // namespace extensions