Merge DevTools Refactor CL to Blink36

Source/bindings/dart/DartController.cpp

Index: Source/bindings/dart/DartController.cpp
diff --git a/Source/bindings/dart/DartController.cpp b/Source/bindings/dart/DartController.cpp
index 1edb9c6645f2d21c9e3b20b22933afe548c261fc..3ddd2f1347e2a0e4c32822c5c7d432b864383a03 100644
--- a/Source/bindings/dart/DartController.cpp
+++ b/Source/bindings/dart/DartController.cpp
@@ -44,12 +44,12 @@
 #include "bindings/dart/DartAsyncLoader.h"
 #include "bindings/dart/DartDOMData.h"
 #include "bindings/dart/DartDOMWrapper.h"
-#include "bindings/dart/DartDebugServer.h"
 #include "bindings/dart/DartGCController.h"
 #include "bindings/dart/DartInspectorTimeline.h"
 #include "bindings/dart/DartIsolateDestructionObserver.h"
 #include "bindings/dart/DartJsInterop.h"
 #include "bindings/dart/DartNativeUtilities.h"
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/dart/DartScriptState.h"
 #include "bindings/dart/DartUtilities.h"
 #include "bindings/dart/ThreadSafeDartIsolateWrapper.h"
@@ -207,7 +207,7 @@ Dart_Isolate DartController::createIsolate(const char* scriptURL, const char* en
 
         if (isDebuggerEnabled) {
             DART_RECORD_TIMER("    createIsolate before debug setup");
-            DartDebugServer::shared().registerIsolate(isolate);
+            DartScriptDebugServer::shared().registerIsolate(isolate, document->page());
             DART_RECORD_TIMER("    createIsolate after debug setup");
         }
     }
@@ -237,7 +237,7 @@ void DartController::shutdownIsolate(Dart_Isolate isolate)
     // If the following assert triggers, we have hit dartbug.com/14183
     // FIXME: keep the isolate alive until the recursion level is 0.
     ASSERT(!*(domData->recursion()));
-    DartDebugServer::shared().unregisterIsolate(isolate);
+    DartScriptDebugServer::shared().unregisterIsolate(isolate, m_frame->page());
     DartIsolateDestructionObservers* observers = domData->isolateDestructionObservers();
     for (DartIsolateDestructionObservers::iterator it = observers->begin(); it != observers->end(); ++it)
         (*it)->isolateDestroyed();