Merge DevTools Refactor CL to Blink36

Source/bindings/dart/DartApplicationLoader.cpp

 // Copyright (c) 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 #include "bindings/dart/DartApplicationLoader.h"
 
 #include "FetchInitiatorTypeNames.h"
 #include "bindings/dart/DartDOMWrapper.h"
-#include "bindings/dart/DartDebugServer.h"
 #include "bindings/dart/DartInspectorTimeline.h"
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/dart/DartUtilities.h"
 #include "bindings/v8/ScriptSourceCode.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/fetch/CachedMetadata.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ScriptResource.h"
 #include "core/frame/DOMWindow.h"
@@ skipping 181 matching lines @@
 void DartApplicationLoader::callEntryPoint()
 {
     if (m_mainInvoked) {
         ASSERT_NOT_REACHED();
         return;
     }
 
     Timeline timeline(m_originDocument->frame(), String("callEntryPoint@") + m_libraryUrl);
     if (m_domEnabled) {
         Timeline timeline(m_originDocument->frame(), String("notifyDebugServer@") + m_libraryUrl);
-        DartDebugServer::shared().isolateLoaded();
+        DartScriptDebugServer::shared().isolateLoaded();
     }
 
     // FIXME: Do we still need this?
     if (m_scriptHasError) {
         // Errors have already been printed to console.
         return;
     }
 
     if (m_domEnabled) {
         V8Scope v8scope(DartDOMData::current());
@@ skipping 45 matching lines @@
     // FIXME: try to dig out line number, -1 for now.
     if (failedUrl.startsWith(String("dart:"))) {
         m_originDocument->logExceptionToConsole(String("The built-in library '") + failedUrl + String("' is not available on Dartium."), m_libraryUrl, -1, 0, nullptr);
     } else {
         m_originDocument->logExceptionToConsole(String("Failed to load a file ") + failedUrl, m_libraryUrl, -1, 0, nullptr);
     }
     m_errorEventDispatcher->dispatchErrorEvent();
 }
 
 }