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

chrome/browser/extensions/extension_devtools_bridge.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/extension_devtools_bridge.h"
 
+#include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
+#include "base/stringprintf.h"
 #include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_devtools_events.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_manager.h"
@@ skipping 77 matching lines @@
   DevToolsManager::GetInstance()->ClientHostClosing(this);
 }
 
 // If the tab we are looking at is going away then we fire a closing event at
 // the extension.
 void ExtensionDevToolsBridge::InspectedContentsClosing() {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   // TODO(knorton): Remove this event in favor of the standard tabs.onRemoved
   // event in extensions.
-  std::string json("[{}]");
+  scoped_ptr<base::ListValue> arguments(new base::ListValue());
+  arguments->Set(0, new base::DictionaryValue());
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
-      on_tab_close_event_name_, json, profile_, GURL(),
+      on_tab_close_event_name_, arguments.Pass(), profile_, GURL(),
       extensions::EventFilteringInfo());
 
   // This may result in this object being destroyed.
   extension_devtools_manager_->BridgeClosingForTab(tab_id_);
 }
 
 void ExtensionDevToolsBridge::DispatchOnInspectorFrontend(
     const std::string& data) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
-  std::string json = base::StringPrintf("[%s]", data.c_str());
+  scoped_ptr<base::ListValue> arguments(new base::ListValue());
+  if (!data.empty()) {
+    arguments->Append(base::JSONReader::Read(data));
+  }
+
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
-      on_page_event_name_, json, profile_, GURL(),
+      on_page_event_name_, arguments.Pass(), profile_, GURL(),
       extensions::EventFilteringInfo());
 }
 
 void ExtensionDevToolsBridge::ContentsReplaced(WebContents* new_contents) {
   // We don't update the tab id as it needs to remain the same so that we can
   // properly unregister.
 }