Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2)

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
 
 #include <memory>
 #include <utility>
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMException.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/page/FocusController.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/serviceworkers/NavigatorServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "platform/weborigin/KURL.h"
@@ skipping 125 matching lines @@
     m_page.reset();
     V8GCController::collectAllGarbageForTesting(isolate());
   }
 
   ExecutionContext* getExecutionContext() { return &(m_page->document()); }
   NavigatorServiceWorker* getNavigatorServiceWorker() {
     return NavigatorServiceWorker::from(m_page->document());
   }
   v8::Isolate* isolate() { return v8::Isolate::GetCurrent(); }
   ScriptState* getScriptState() {
-    return ScriptState::forMainWorld(m_page->document().frame());
+    return toScriptStateForMainWorld(m_page->document().frame());
   }
 
   void provide(std::unique_ptr<WebServiceWorkerProvider> provider) {
     Supplement<Document>::provideTo(
         m_page->document(), ServiceWorkerContainerClient::supplementName(),
         new ServiceWorkerContainerClient(m_page->document(),
                                          std::move(provider)));
   }
 
   void setPageURL(const String& url) {
@@ skipping 199 matching lines @@
     ScriptState::Scope scriptScope(getScriptState());
     container->getRegistration(getScriptState(), "");
     EXPECT_EQ(1ul, stubProvider.getRegistrationCallCount());
     EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/index.html")),
               stubProvider.getRegistrationURL());
   }
 }
 
 }  // namespace
 }  // namespace blink