blink: Rename modules/ method to prefix with get when they collide.

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.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/ServiceWorkerWindowClient.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 32 matching lines @@
 String ServiceWorkerWindowClient::visibilityState() const
 {
     return pageVisibilityStateString(static_cast<PageVisibilityState>(m_pageVisibilityState));
 }
 
 ScriptPromise ServiceWorkerWindowClient::focus(ScriptState* scriptState)
 {
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
-    if (!scriptState->executionContext()->isWindowInteractionAllowed()) {
+    if (!scriptState->getExecutionContext()->isWindowInteractionAllowed()) {
         resolver->reject(DOMException::create(InvalidAccessError, "Not allowed to focus a window."));
         return promise;
     }
-    scriptState->executionContext()->consumeWindowInteraction();
+    scriptState->getExecutionContext()->consumeWindowInteraction();
 
-    ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->focus(uuid(), new CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver));
+    ServiceWorkerGlobalScopeClient::from(scriptState->getExecutionContext())->focus(uuid(), new CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver));
     return promise;
 }
 
 ScriptPromise ServiceWorkerWindowClient::navigate(ScriptState* scriptState, const String& url)
 {
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
-    ExecutionContext* context = scriptState->executionContext();
+    ExecutionContext* context = scriptState->getExecutionContext();
 
     KURL parsedUrl = KURL(toWorkerGlobalScope(context)->location()->url(), url);
     if (!parsedUrl.isValid() || parsedUrl.protocolIsAbout()) {
         resolver->reject(V8ThrowException::createTypeError(scriptState->isolate(), "'" + url + "' is not a valid URL."));
         return promise;
     }
-    if (!context->securityOrigin()->canDisplay(parsedUrl)) {
+    if (!context->getSecurityOrigin()->canDisplay(parsedUrl)) {
         resolver->reject(V8ThrowException::createTypeError(scriptState->isolate(), "'" + parsedUrl.elidedString() + "' cannot navigate."));
         return promise;
     }
 
     ServiceWorkerGlobalScopeClient::from(context)->navigate(uuid(), parsedUrl, new NavigateClientCallback(resolver));
     return promise;
 }
 
 DEFINE_TRACE(ServiceWorkerWindowClient)
 {
     ServiceWorkerClient::trace(visitor);
 }
 
 } // namespace blink