Merge DevTools Refactor CL to Blink36

Source/core/inspector/PageDebuggerAgent.cpp

Index: Source/core/inspector/PageDebuggerAgent.cpp
diff --git a/Source/core/inspector/PageDebuggerAgent.cpp b/Source/core/inspector/PageDebuggerAgent.cpp
index 4e737127e3170f66eebf6c7ca5065270d189b497..ec3b4e555ce3178a780fc59a3fdff167ea00e5d3 100644
--- a/Source/core/inspector/PageDebuggerAgent.cpp
+++ b/Source/core/inspector/PageDebuggerAgent.cpp
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "core/inspector/PageDebuggerAgent.h"
 
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/v8/DOMWrapperWorld.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/ScriptSourceCode.h"
@@ -44,17 +45,18 @@
 
 namespace WebCore {
 
-PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
+PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(UnifiedScriptDebugServer* unifiedScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
 {
-    return adoptPtr(new PageDebuggerAgent(pageScriptDebugServer, pageAgent, injectedScriptManager, overlay));
+    return adoptPtr(new PageDebuggerAgent(unifiedScriptDebugServer, pageAgent, injectedScriptManager, overlay));
 }
 
-PageDebuggerAgent::PageDebuggerAgent(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
+PageDebuggerAgent::PageDebuggerAgent(UnifiedScriptDebugServer* unifiedScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
     : InspectorDebuggerAgent(injectedScriptManager)
-    , m_pageScriptDebugServer(pageScriptDebugServer)
+    , m_unifiedScriptDebugServer(unifiedScriptDebugServer)
     , m_pageAgent(pageAgent)
     , m_overlay(overlay)
 {
+    ASSERT(m_unifiedScriptDebugServer);
     m_overlay->overlayHost()->setListener(this);
 }
 
@@ -76,17 +78,17 @@ void PageDebuggerAgent::disable()
 
 void PageDebuggerAgent::startListeningScriptDebugServer()
 {
-    scriptDebugServer().addListener(this, m_pageAgent->page());
+    m_unifiedScriptDebugServer->addListener(this, m_pageAgent->page());
 }
 
 void PageDebuggerAgent::stopListeningScriptDebugServer()
 {
-    scriptDebugServer().removeListener(this, m_pageAgent->page());
+    m_unifiedScriptDebugServer->removeListener(this, m_pageAgent->page());
 }
 
-PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
+ScriptDebugServerBase& PageDebuggerAgent::scriptDebugServer()
 {
-    return *m_pageScriptDebugServer;
+    return *m_unifiedScriptDebugServer;
 }
 
 void PageDebuggerAgent::muteConsole()
@@ -111,13 +113,13 @@ void PageDebuggerAgent::overlaySteppedOver()
     stepOver(&error, 0);
 }
 
-InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
+InjectedScript& PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
 {
     if (!executionContextId) {
         ScriptState* scriptState = V8ScriptState::forMainWorld(m_pageAgent->mainFrame());
         return injectedScriptManager()->injectedScriptFor(scriptState);
     }
-    InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
+    InjectedScript& injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
     if (injectedScript.isEmpty())
         *errorString = "Execution context with given id not found.";
     return injectedScript;
@@ -144,15 +146,13 @@ void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 String PageDebuggerAgent::preprocessEventListener(LocalFrame* frame, const String& source, const String& url, const String& functionName)
 {
     ASSERT(frame);
-    ASSERT(m_pageScriptDebugServer);
-    return m_pageScriptDebugServer->preprocessEventListener(frame, source, url, functionName);
+    return m_unifiedScriptDebugServer->preprocessEventListener(frame, source, url, functionName);
 }
 
 PassOwnPtr<ScriptSourceCode> PageDebuggerAgent::preprocess(LocalFrame* frame, const ScriptSourceCode& sourceCode)
 {
-    ASSERT(m_pageScriptDebugServer);
     ASSERT(frame);
-    return m_pageScriptDebugServer->preprocess(frame, sourceCode);
+    return m_unifiedScriptDebugServer->preprocess(frame, sourceCode);
 }
 
 void PageDebuggerAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)