Merge DevTools Refactor CL to Blink36

Source/core/inspector/PageRuntimeAgent.h

Index: Source/core/inspector/PageRuntimeAgent.h
diff --git a/Source/core/inspector/PageRuntimeAgent.h b/Source/core/inspector/PageRuntimeAgent.h
index 0a1d9a3bf21096078443a5bba0cd66c2a87f75a2..693fdafa3246a26b5a35f2155e1d53380a04d807 100644
--- a/Source/core/inspector/PageRuntimeAgent.h
+++ b/Source/core/inspector/PageRuntimeAgent.h
@@ -43,7 +43,7 @@ class SecurityOrigin;
 
 class PageRuntimeAgent FINAL : public InspectorRuntimeAgent {
 public:
-    static PassOwnPtr<PageRuntimeAgent> create(InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer, Page* page, InspectorPageAgent* pageAgent)
+    static PassOwnPtr<PageRuntimeAgent> create(InjectedScriptManager* injectedScriptManager, ScriptDebugServerBase* scriptDebugServer, Page* page, InspectorPageAgent* pageAgent)
     {
         return adoptPtr(new PageRuntimeAgent(injectedScriptManager, scriptDebugServer, page, pageAgent));
     }
@@ -56,14 +56,14 @@ public:
     void frameWindowDiscarded(DOMWindow*);
 
 private:
-    PageRuntimeAgent(InjectedScriptManager*, ScriptDebugServer*, Page*, InspectorPageAgent*);
+    PageRuntimeAgent(InjectedScriptManager*, ScriptDebugServerBase*, Page*, InspectorPageAgent*);
 
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) OVERRIDE;
+    virtual InjectedScript& injectedScriptForEval(ErrorString*, const int* executionContextId) OVERRIDE;
     virtual void muteConsole() OVERRIDE;
     virtual void unmuteConsole() OVERRIDE;
     void reportExecutionContextCreation();
     void notifyContextCreated(const String& frameId, ScriptState*, SecurityOrigin*, bool isPageContext);
-    void notifyDartContextCreated(const String& frameId, V8ScriptState* v8ScriptState);
+    void notifyDartContextCreated(const String& frameId, V8ScriptState*);
 
     Page* m_inspectedPage;
     InspectorPageAgent* m_pageAgent;