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

third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.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/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
@@ skipping 73 matching lines @@
 class MediaKeySystemAccessInitializer final : public EncryptedMediaRequest {
     WTF_MAKE_NONCOPYABLE(MediaKeySystemAccessInitializer);
 
 public:
     MediaKeySystemAccessInitializer(ScriptState*, const String& keySystem, const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations);
     ~MediaKeySystemAccessInitializer() override { }
 
     // EncryptedMediaRequest implementation.
     WebString keySystem() const override { return m_keySystem; }
     const WebVector<WebMediaKeySystemConfiguration>& supportedConfigurations() const override { return m_supportedConfigurations; }
-    SecurityOrigin* securityOrigin() const override { return m_resolver->executionContext()->securityOrigin(); }
+    SecurityOrigin* getSecurityOrigin() const override { return m_resolver->getExecutionContext()->getSecurityOrigin(); }
     void requestSucceeded(WebContentDecryptionModuleAccess*) override;
     void requestNotSupported(const WebString& errorMessage) override;
 
     ScriptPromise promise() { return m_resolver->promise(); }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_resolver);
         EncryptedMediaRequest::trace(visitor);
     }
@@ skipping 84 matching lines @@
         if (hasEmptyRobustness)
             break;
     }
 
     if (hasVideoCapabilities) {
         DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, emptyRobustnessHistogram, new EnumerationHistogram("Media.EME.Widevine.VideoCapability.HasEmptyRobustness", 2));
         emptyRobustnessHistogram.count(hasEmptyRobustness);
     }
 
     if (hasEmptyRobustness) {
-        m_resolver->executionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel,
+        m_resolver->getExecutionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel,
             "It is recommended that a robustness level be specified. Not specifying the robustness level could "
             "result in unexpected behavior in the future, potentially including failure to play."));
     }
 }
 
 } // namespace
 
 ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
     ScriptState* scriptState,
     Navigator& navigator,
@@ skipping 13 matching lines @@
 
     // 2. If supportedConfigurations was provided and is empty, return a
     //    promise rejected with a new DOMException whose name is
     //    InvalidAccessError.
     if (!supportedConfigurations.size()) {
         return ScriptPromise::rejectWithDOMException(
             scriptState, DOMException::create(InvalidAccessError, "The supportedConfigurations parameter is empty."));
     }
 
     // 3-4. 'May Document use powerful features?' check.
-    ExecutionContext* executionContext = scriptState->executionContext();
+    ExecutionContext* executionContext = scriptState->getExecutionContext();
     String errorMessage;
     if (executionContext->isSecureContext(errorMessage)) {
         UseCounter::count(executionContext, UseCounter::EncryptedMediaSecureOrigin);
     } else {
         Deprecation::countDeprecation(executionContext, UseCounter::EncryptedMediaInsecureOrigin);
         // TODO(ddorwin): Implement the following:
         // Reject promise with a new DOMException whose name is NotSupportedError.
     }
 
     // 5. Let origin be the origin of document.
@@ skipping 13 matching lines @@
     //    initialize the MediaKeySystemAccess object.
     MediaKeysController* controller = MediaKeysController::from(document->page());
     WebEncryptedMediaClient* mediaClient = controller->encryptedMediaClient(executionContext);
     mediaClient->requestMediaKeySystemAccess(WebEncryptedMediaRequest(initializer));
 
     // 8. Return promise.
     return promise;
 }
 
 } // namespace blink