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

third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.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/navigatorconnect/AcceptConnectionObserver.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
@@ skipping 58 matching lines @@
 }
 
 void AcceptConnectionObserver::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
     m_state = Done;
 }
 
 void AcceptConnectionObserver::didDispatchEvent()
 {
-    ASSERT(executionContext());
+    ASSERT(getExecutionContext());
     if (m_state != Initial)
         return;
     responseWasRejected();
 }
 
 ScriptPromise AcceptConnectionObserver::respondWith(ScriptState* scriptState, ScriptPromise value, ExceptionState& exceptionState)
 {
     if (m_state != Initial) {
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "respondWith was already called."));
     }
 
     m_state = Pending;
     m_resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = m_resolver->promise();
     value.then(
         ThenFunction::createFunction(scriptState, this, ThenFunction::Fulfilled),
         ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected));
     return promise;
 }
 
 void AcceptConnectionObserver::responseWasRejected()
 {
-    ASSERT(executionContext());
+    ASSERT(getExecutionContext());
     if (m_resolver)
         m_resolver->reject(DOMException::create(AbortError));
     m_callbacks->onError();
     m_state = Done;
 }
 
 void AcceptConnectionObserver::responseWasResolved(const ScriptValue& value)
 {
-    ASSERT(executionContext());
+    ASSERT(getExecutionContext());
 
-    ScriptState* scriptState = m_resolver->scriptState();
+    ScriptState* scriptState = m_resolver->getScriptState();
     ExceptionState exceptionState(ExceptionState::UnknownContext, nullptr, nullptr, scriptState->context()->Global(), scriptState->isolate());
     ServicePortConnectResponse response = ScriptValue::to<ServicePortConnectResponse>(scriptState->isolate(), value, exceptionState);
     if (exceptionState.hadException()) {
         exceptionState.reject(m_resolver.get());
         m_resolver = nullptr;
         responseWasRejected();
         return;
     }
     if (!response.hasAccept() || !response.accept()) {
         responseWasRejected();
@@ skipping 14 matching lines @@
     }
     webPort.id = m_portID;
     ServicePort* port = ServicePort::create(m_collection, webPort);
     m_collection->addPort(port);
     m_resolver->resolve(port);
     m_callbacks->onSuccess(webPort);
     m_state = Done;
 }
 
 AcceptConnectionObserver::AcceptConnectionObserver(ServicePortCollection* collection, PassOwnPtr<WebServicePortConnectEventCallbacks> callbacks, WebServicePortID portID, const KURL& targetURL)
-    : ContextLifecycleObserver(collection->executionContext())
+    : ContextLifecycleObserver(collection->getExecutionContext())
     , m_callbacks(callbacks)
     , m_collection(collection)
     , m_portID(portID)
     , m_targetURL(targetURL)
     , m_state(Initial)
 {
 }
 
 DEFINE_TRACE(AcceptConnectionObserver)
 {
     visitor->trace(m_collection);
     visitor->trace(m_resolver);
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink