Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 7 insertions, 31 deletions

diff --git a/WebKit/chromium/src/DebuggerAgentImpl.h b/WebKit/chromium/src/DebuggerAgentImpl.h
index 0e6e6af..a8fcc4e 100644
--- a/WebKit/chromium/src/DebuggerAgentImpl.h
+++ b/WebKit/chromium/src/DebuggerAgentImpl.h
@@ -31,55 +31,31 @@
 #ifndef DebuggerAgentImpl_h
 #define DebuggerAgentImpl_h
 
-#include "DebuggerAgent.h"
-
-#include <v8.h>
-#include <wtf/HashSet.h>
-#include <wtf/Noncopyable.h>
+#include <wtf/Forward.h>
 
 namespace WebCore {
-class Document;
-class Frame;
-class Node;
 class Page;
-class String;
 }
 
 namespace WebKit {
 
+class WebDevToolsAgentClient;
 class WebDevToolsAgentImpl;
 class WebViewImpl;
 
-class DebuggerAgentImpl : public DebuggerAgent {
+class DebuggerAgentImpl {
 public:
     DebuggerAgentImpl(WebKit::WebViewImpl* webViewImpl,
-                      DebuggerAgentDelegate* delegate,
-                      WebDevToolsAgentImpl* webdevtoolsAgent);
+                      WebDevToolsAgentImpl* webdevtoolsAgent,
+                      WebDevToolsAgentClient* webdevtoolsAgentClient);
     virtual ~DebuggerAgentImpl();
 
-    // DebuggerAgent implementation.
-    virtual void getContextId();
-    virtual void processDebugCommands();
-
-    void debuggerOutput(const WebCore::String& out);
+    void debuggerOutput(const WTF::String& out);
 
     void setAutoContinueOnException(bool autoContinue) { m_autoContinueOnException = autoContinue; }
 
     bool autoContinueOnException() { return m_autoContinueOnException; }
 
-    // Executes function with the given name in the utility context. Passes node
-    // and json args as parameters. Note that the function called must be
-    // implemented in the inject_dispatch.js file.
-    WebCore::String executeUtilityFunction(
-        v8::Handle<v8::Context> context,
-        int callId,
-        const char* object,
-        const WebCore::String& functionName,
-        const WebCore::String& jsonArgs,
-        bool async,
-        WebCore::String* exception);
-
-
     WebCore::Page* page();
     WebDevToolsAgentImpl* webdevtoolsAgent() { return m_webdevtoolsAgent; }
 
@@ -87,8 +63,8 @@ public:
 
 private:
     WebKit::WebViewImpl* m_webViewImpl;
-    DebuggerAgentDelegate* m_delegate;
     WebDevToolsAgentImpl* m_webdevtoolsAgent;
+    WebDevToolsAgentClient* m_webdevtoolsAgentClient;
     bool m_autoContinueOnException;
 };