DevTools: mitigate WebKit console API changes.

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

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

3 files changed, 2 insertions, 18 deletions

diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index d333c88..2fed562 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -335,6 +335,7 @@ devtools.DebuggerAgent.prototype.createExceptionMessage_ = function(
     url, line, message) {
   this.currentExceptionMessage_ = new WebInspector.ConsoleMessage(
       WebInspector.ConsoleMessage.MessageSource.JS,
+      WebInspector.ConsoleMessage.MessageType.Log,
       WebInspector.ConsoleMessage.MessageLevel.Error,
       line,
       url,
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index aa32dcc..9253738 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -43,8 +43,6 @@ devtools.ToolsAgent = function() {
       goog.bind(this.updateFocusedNode_, this);
   RemoteToolsAgent.FrameNavigate =
       goog.bind(this.frameNavigate_, this);
-  RemoteToolsAgent.AddMessageToConsole =
-      goog.bind(this.addMessageToConsole_, this);
   RemoteToolsAgent.DispatchOnClient =
       goog.bind(this.dispatchOnClient_, this);
   RemoteToolsAgent.SetResourcesPanelEnabled =
@@ -131,21 +129,6 @@ devtools.ToolsAgent.prototype.frameNavigate_ = function(url) {
 
 
 /**
- * @param {Object} message Message object to add.
- * @see tools_agent.h
- * @private
- */
-devtools.ToolsAgent.prototype.addMessageToConsole_ = function(message) {
-  var console = WebInspector.console;
-  if (console) {
-    console.addMessage(new WebInspector.ConsoleMessage(
-        message.source, message.level, message.line, message.sourceId,
-        undefined, 1, message.text));
-  }
-};
-
-
-/**
  * @param {string} message Serialized call to be dispatched on WebInspector.
  * @private
  */
diff --git a/webkit/glue/devtools/js/devtools_host_stub.js b/webkit/glue/devtools/js/devtools_host_stub.js
index d1610d8..4d875d3 100644
--- a/webkit/glue/devtools/js/devtools_host_stub.js
+++ b/webkit/glue/devtools/js/devtools_host_stub.js
@@ -21,7 +21,7 @@ RemoteDebuggerAgentStub.prototype.DebugBreak = function() {
 
 
 RemoteDebuggerAgentStub.prototype.GetContextId = function() {
-  RemoteDebuggerAgent.DidGetContextId(3);
+  RemoteDebuggerAgent.SetContextId(3);
 };