Merge DevTools Refactor CL to Blink36

Source/core/inspector/InspectorRuntimeAgent.h

Index: Source/core/inspector/InspectorRuntimeAgent.h
diff --git a/Source/core/inspector/InspectorRuntimeAgent.h b/Source/core/inspector/InspectorRuntimeAgent.h
index c91d309f4668d4bf73f4cb6da0e0ac863f937a31..dff2584c314574c740523909ba284d7cc8682a84 100644
--- a/Source/core/inspector/InspectorRuntimeAgent.h
+++ b/Source/core/inspector/InspectorRuntimeAgent.h
@@ -44,6 +44,7 @@ class InstrumentingAgents;
 class JSONArray;
 class ScriptState;
 class ScriptDebugServer;
+class ScriptDebugServerBase;
 
 typedef String ErrorString;
 
@@ -75,7 +76,13 @@ public:
                         RefPtr<TypeBuilder::Runtime::RemoteObject>& result,
                         TypeBuilder::OptOutput<bool>* wasThrown) OVERRIDE FINAL;
     virtual void releaseObject(ErrorString*, const String& objectId) OVERRIDE FINAL;
+    virtual void getCompletions(ErrorString*,
+        const String& expression,
+        const int* executionContextId,
+        RefPtr<TypeBuilder::Array<String> >& result) OVERRIDE FINAL;
+
     virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, const bool* accessorPropertiesOnly, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescriptor> >& result, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor> >& internalProperties) OVERRIDE FINAL;
+    virtual void getProperty(ErrorString*, const String& objectId, const RefPtr<JSONArray>& propertyPath, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown);
     virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) OVERRIDE FINAL;
     virtual void run(ErrorString*) OVERRIDE;
 
@@ -84,8 +91,8 @@ public:
     virtual void restore() OVERRIDE FINAL;
 
 protected:
-    InspectorRuntimeAgent(InjectedScriptManager*, ScriptDebugServer*);
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
+    InspectorRuntimeAgent(InjectedScriptManager*, ScriptDebugServerBase*);
+    virtual InjectedScript& injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
 
     virtual void muteConsole() = 0;
     virtual void unmuteConsole() = 0;
@@ -101,7 +108,7 @@ protected:
 
 private:
     InjectedScriptManager* m_injectedScriptManager;
-    ScriptDebugServer* m_scriptDebugServer;
+    ScriptDebugServerBase* m_scriptDebugServer;
 };
 
 } // namespace WebCore