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

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

Index: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
index 7bb33ccd7e392979531df37f7c7b5706d7a38641..8602f439e901cc4e440fec7d7fdbd92ccf813edc 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
@@ -35,7 +35,7 @@ NavigatorServiceWorker& NavigatorServiceWorker::from(Navigator& navigator)
     if (!supplement) {
         supplement = new NavigatorServiceWorker(navigator);
         provideTo(navigator, supplementName(), supplement);
-        if (navigator.frame() && navigator.frame()->securityContext()->securityOrigin()->canAccessServiceWorkers()) {
+        if (navigator.frame() && navigator.frame()->securityContext()->getSecurityOrigin()->canAccessServiceWorkers()) {
             // Initialize ServiceWorkerContainer too.
             supplement->serviceWorker(ASSERT_NO_EXCEPTION);
         }
@@ -55,13 +55,13 @@ const char* NavigatorServiceWorker::supplementName()
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExecutionContext* executionContext, Navigator& navigator, ExceptionState& exceptionState)
 {
-    ASSERT(!navigator.frame() || executionContext->securityOrigin()->canAccessCheckSuborigins(navigator.frame()->securityContext()->securityOrigin()));
+    ASSERT(!navigator.frame() || executionContext->getSecurityOrigin()->canAccessCheckSuborigins(navigator.frame()->securityContext()->getSecurityOrigin()));
     return NavigatorServiceWorker::from(navigator).serviceWorker(exceptionState);
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExceptionState& exceptionState)
 {
-    if (frame() && !frame()->securityContext()->securityOrigin()->canAccessServiceWorkers()) {
+    if (frame() && !frame()->securityContext()->getSecurityOrigin()->canAccessServiceWorkers()) {
         if (frame()->securityContext()->isSandboxed(SandboxOrigin))
             exceptionState.throwSecurityError("Service worker is disabled because the context is sandboxed and lacks the 'allow-same-origin' flag.");
         else
@@ -70,7 +70,7 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExceptionState& ex
     }
     if (!m_serviceWorker && frame()) {
         ASSERT(frame()->domWindow());
-        m_serviceWorker = ServiceWorkerContainer::create(frame()->domWindow()->executionContext());
+        m_serviceWorker = ServiceWorkerContainer::create(frame()->domWindow()->getExecutionContext());
     }
     return m_serviceWorker.get();
 }