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

chrome/browser/accessibility/accessibility_extension_api.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/accessibility/accessibility_extension_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/browser/notification_service.h"
 
 namespace keys = extension_accessibility_api_constants;
 
 // Returns the AccessibilityControlInfo serialized into a JSON string,
 // consisting of an array of a single object of type AccessibilityObject,
 // as defined in the accessibility extension api's json schema.
-std::string ControlInfoToJsonString(const AccessibilityEventInfo* info) {
-  ListValue args;
+scoped_ptr<ListValue> ControlInfoToEventArguments(
+    const AccessibilityEventInfo* info) {
   DictionaryValue* dict = new DictionaryValue();
   info->SerializeToDict(dict);
-  args.Append(dict);
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
-  return json_args;
+
+  scoped_ptr<ListValue> args(new ListValue());
+  args->Append(dict);
+  return args.Pass();
 }
 
 ExtensionAccessibilityEventRouter*
     ExtensionAccessibilityEventRouter::GetInstance() {
   return Singleton<ExtensionAccessibilityEventRouter>::get();
 }
 
 ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
     : enabled_(false) {
   registrar_.Add(this,
@@ skipping 63 matching lines @@
 void ExtensionAccessibilityEventRouter::SetAccessibilityEnabled(bool enabled) {
   enabled_ = enabled;
 }
 
 bool ExtensionAccessibilityEventRouter::IsAccessibilityEnabled() const {
   return enabled_;
 }
 
 void ExtensionAccessibilityEventRouter::OnWindowOpened(
     const AccessibilityWindowInfo* info) {
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnWindowOpened, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnWindowOpened, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnWindowClosed(
     const AccessibilityWindowInfo* info) {
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnWindowClosed, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnWindowClosed, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnControlFocused(
     const AccessibilityControlInfo* info) {
   last_focused_control_dict_.Clear();
   info->SerializeToDict(&last_focused_control_dict_);
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnControlFocused, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnControlFocused, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnControlAction(
     const AccessibilityControlInfo* info) {
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnControlAction, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnControlAction, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnTextChanged(
     const AccessibilityControlInfo* info) {
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnTextChanged, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnTextChanged, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnMenuOpened(
     const AccessibilityMenuInfo* info) {
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnMenuOpened, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnMenuOpened, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnMenuClosed(
     const AccessibilityMenuInfo* info) {
-  std::string json_args = ControlInfoToJsonString(info);
-  DispatchEvent(info->profile(), keys::kOnMenuClosed, json_args);
+  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
+  DispatchEvent(info->profile(), keys::kOnMenuClosed, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::DispatchEvent(
     Profile* profile,
     const char* event_name,
-    const std::string& json_args) {
+    scoped_ptr<base::ListValue> event_args) {
   if (enabled_ && profile && profile->GetExtensionEventRouter()) {
-    profile->GetExtensionEventRouter()->DispatchEventToRenderers(
-        event_name, json_args, NULL, GURL(), extensions::EventFilteringInfo());
+    profile->GetExtensionEventRouter()->DispatchEventToRenderers(event_name,
+        event_args.Pass(), NULL, GURL(), extensions::EventFilteringInfo());
   }
 }
 
 bool SetAccessibilityEnabledFunction::RunImpl() {
   bool enabled;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &enabled));
   ExtensionAccessibilityEventRouter::GetInstance()
       ->SetAccessibilityEnabled(enabled);
   return true;
 }
@@ skipping 41 matching lines @@
       DictionaryValue* alert_value = new DictionaryValue;
       const string16 message_text = confirm_infobar_delegate->GetMessageText();
       alert_value->SetString(keys::kMessageKey, message_text);
       alerts_value->Append(alert_value);
     }
   }
 
   SetResult(alerts_value);
   return true;
 }