Merge DevTools Refactor CL to Blink36

Source/core/inspector/PageDebuggerAgent.h

Index: Source/core/inspector/PageDebuggerAgent.h
diff --git a/Source/core/inspector/PageDebuggerAgent.h b/Source/core/inspector/PageDebuggerAgent.h
index 97f2553dff757d4bbe4cee19986a326d69eff832..f3f659ea280edb6ee535e8e9174aa3219b6f8c5c 100644
--- a/Source/core/inspector/PageDebuggerAgent.h
+++ b/Source/core/inspector/PageDebuggerAgent.h
@@ -31,6 +31,7 @@
 #ifndef PageDebuggerAgent_h
 #define PageDebuggerAgent_h
 
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/v8/PageScriptDebugServer.h"
 #include "core/inspector/InspectorDebuggerAgent.h"
 #include "core/inspector/InspectorOverlayHost.h"
@@ -41,7 +42,7 @@ class DocumentLoader;
 class InspectorOverlay;
 class InspectorPageAgent;
 class Page;
-class PageScriptDebugServer;
+class UnifiedScriptDebugServer;
 class ScriptSourceCode;
 
 class PageDebuggerAgent FINAL :
@@ -50,7 +51,7 @@ class PageDebuggerAgent FINAL :
     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<PageDebuggerAgent> create(PageScriptDebugServer*, InspectorPageAgent*, InjectedScriptManager*, InspectorOverlay*);
+    static PassOwnPtr<PageDebuggerAgent> create(UnifiedScriptDebugServer*, InspectorPageAgent*, InjectedScriptManager*, InspectorOverlay*);
     virtual ~PageDebuggerAgent();
 
     void didClearDocumentOfWindowObject(LocalFrame*);
@@ -65,7 +66,7 @@ protected:
 private:
     virtual void startListeningScriptDebugServer() OVERRIDE;
     virtual void stopListeningScriptDebugServer() OVERRIDE;
-    virtual PageScriptDebugServer& scriptDebugServer() OVERRIDE;
+    virtual ScriptDebugServerBase& scriptDebugServer() OVERRIDE;
     virtual void muteConsole() OVERRIDE;
     virtual void unmuteConsole() OVERRIDE;
 
@@ -73,11 +74,11 @@ private:
     virtual void overlayResumed() OVERRIDE;
     virtual void overlaySteppedOver() OVERRIDE;
 
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) OVERRIDE;
+    virtual InjectedScript& injectedScriptForEval(ErrorString*, const int* executionContextId) OVERRIDE;
     virtual void setOverlayMessage(ErrorString*, const String*) OVERRIDE;
 
-    PageDebuggerAgent(PageScriptDebugServer*, InspectorPageAgent*, InjectedScriptManager*, InspectorOverlay*);
-    PageScriptDebugServer* m_pageScriptDebugServer;
+    PageDebuggerAgent(UnifiedScriptDebugServer*, InspectorPageAgent*, InjectedScriptManager*, InspectorOverlay*);
+    UnifiedScriptDebugServer* m_unifiedScriptDebugServer;
     InspectorPageAgent* m_pageAgent;
     InspectorOverlay* m_overlay;
 };