Merge DevTools Refactor CL to Blink36

Source/core/inspector/PageRuntimeAgent.cpp

Index: Source/core/inspector/PageRuntimeAgent.cpp
diff --git a/Source/core/inspector/PageRuntimeAgent.cpp b/Source/core/inspector/PageRuntimeAgent.cpp
index a07e27bdcf7f4ccc97b387d0341ea31df584e1d1..92c132b49d4a0fe28272b225056ba41eee2f0605 100644
--- a/Source/core/inspector/PageRuntimeAgent.cpp
+++ b/Source/core/inspector/PageRuntimeAgent.cpp
@@ -46,7 +46,7 @@
 
 namespace WebCore {
 
-PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer, Page* page, InspectorPageAgent* pageAgent)
+PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, ScriptDebugServerBase* scriptDebugServer, Page* page, InspectorPageAgent* pageAgent)
     : InspectorRuntimeAgent(injectedScriptManager, scriptDebugServer)
     , m_inspectedPage(page)
     , m_pageAgent(pageAgent)
@@ -103,16 +103,16 @@ void PageRuntimeAgent::didCreateIsolatedContext(LocalFrame* frame, ScriptState*
     addExecutionContextToFrontend(scriptState, false, origin ? origin->toRawString() : "", frameId);
 }
 
-InjectedScript PageRuntimeAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
+InjectedScript& PageRuntimeAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
 {
     if (!executionContextId) {
         ScriptState* scriptState = V8ScriptState::forMainWorld(m_inspectedPage->mainFrame());
-        InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
+        InjectedScript& result = injectedScriptManager()->injectedScriptFor(scriptState);
         if (result.isEmpty())
             *errorString = "Internal error: main world execution context not found.";
         return result;
     }
-    InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
+    InjectedScript& injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
     if (injectedScript.isEmpty())
         *errorString = "Execution context with given id not found.";
     return injectedScript;