This is downstream fix for chrome.experimental.debugger API.

The DevTools messages format has been migrated to JSON-RPC-2.0 spec upstream.

TEST=ExtensionApiTest.Debugger
BUG=none

Review URL: http://codereview.chromium.org/6813039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80930 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 11 deletions

diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index e494cd3..1450dec 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -34,16 +34,14 @@ ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
 ExtensionDevToolsBridge::~ExtensionDevToolsBridge() {
 }
 
-static std::string FormatDevToolsMessage(int seq,
-                                         const std::string& domain,
-                                         const std::string& command,
-                                         DictionaryValue* arguments) {
+static std::string FormatDevToolsMessage(int id,
+                                         const std::string& method,
+                                         DictionaryValue* params) {
 
   DictionaryValue message;
-  message.SetInteger("seq", seq);
-  message.SetString("domain", domain);
-  message.SetString("command", command);
-  message.Set("arguments", arguments);
+  message.SetInteger("id", id);
+  message.SetString("method", method);
+  message.Set("params", params);
 
   std::string json;
   base::JSONWriter::Write(&message, false, &json);
@@ -81,8 +79,7 @@ bool ExtensionDevToolsBridge::RegisterAsDevToolsClientHost() {
         this,
         DevToolsAgentMsg_DispatchOnInspectorBackend(
             FormatDevToolsMessage(2,
-                                  "Timeline",
-                                  "start",
+                                  "Timeline.start",
                                   new DictionaryValue())));
     return true;
   }