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

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 "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 140 matching lines @@
         : m_page(DummyPageHolder::create())
     {
     }
 
     ~ServiceWorkerContainerTest()
     {
         m_page.clear();
         V8GCController::collectAllGarbageForTesting(isolate());
     }
 
-    ExecutionContext* executionContext() { return &(m_page->document()); }
+    ExecutionContext* getExecutionContext() { return &(m_page->document()); }
     v8::Isolate* isolate() { return v8::Isolate::GetCurrent(); }
-    ScriptState* scriptState() { return ScriptState::forMainWorld(m_page->document().frame()); }
+    ScriptState* getScriptState() { return ScriptState::forMainWorld(m_page->document().frame()); }
 
     void provide(PassOwnPtr<WebServiceWorkerProvider> provider)
     {
         WillBeHeapSupplement<Document>::provideTo(m_page->document(), ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(provider));
     }
 
     void setPageURL(const String& url)
     {
         // For URL completion.
         m_page->document().setURL(KURL(KURL(), url));
 
         // The basis for security checks.
         m_page->document().setSecurityOrigin(SecurityOrigin::createFromString(url));
     }
 
     void testRegisterRejected(const String& scriptURL, const String& scope, const ScriptValueTest& valueTest)
     {
         // When the registration is rejected, a register call must not reach
         // the provider.
         provide(adoptPtr(new NotReachedWebServiceWorkerProvider()));
 
-        ServiceWorkerContainer* container = ServiceWorkerContainer::create(executionContext());
-        ScriptState::Scope scriptScope(scriptState());
+        ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
+        ScriptState::Scope scriptScope(getScriptState());
         RegistrationOptions options;
         options.setScope(scope);
-        ScriptPromise promise = container->registerServiceWorker(scriptState(), scriptURL, options);
-        expectRejected(scriptState(), promise, valueTest);
+        ScriptPromise promise = container->registerServiceWorker(getScriptState(), scriptURL, options);
+        expectRejected(getScriptState(), promise, valueTest);
 
         container->willBeDetachedFromFrame();
     }
 
     void testGetRegistrationRejected(const String& documentURL, const ScriptValueTest& valueTest)
     {
         provide(adoptPtr(new NotReachedWebServiceWorkerProvider()));
 
-        ServiceWorkerContainer* container = ServiceWorkerContainer::create(executionContext());
-        ScriptState::Scope scriptScope(scriptState());
-        ScriptPromise promise = container->getRegistration(scriptState(), documentURL);
-        expectRejected(scriptState(), promise, valueTest);
+        ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
+        ScriptState::Scope scriptScope(getScriptState());
+        ScriptPromise promise = container->getRegistration(getScriptState(), documentURL);
+        expectRejected(getScriptState(), promise, valueTest);
 
         container->willBeDetachedFromFrame();
     }
 
 private:
     OwnPtr<DummyPageHolder> m_page;
 };
 
 TEST_F(ServiceWorkerContainerTest, Register_NonSecureOriginIsRejected)
 {
@@ skipping 105 matching lines @@
     WebURL m_getRegistrationURL;
 };
 
 TEST_F(ServiceWorkerContainerTest, RegisterUnregister_NonHttpsSecureOriginDelegatesToProvider)
 {
     setPageURL("http://localhost/x/index.html");
 
     StubWebServiceWorkerProvider stubProvider;
     provide(stubProvider.provider());
 
-    ServiceWorkerContainer* container = ServiceWorkerContainer::create(executionContext());
+    ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
 
     // register
     {
-        ScriptState::Scope scriptScope(scriptState());
+        ScriptState::Scope scriptScope(getScriptState());
         RegistrationOptions options;
         options.setScope("y/");
-        container->registerServiceWorker(scriptState(), "/x/y/worker.js", options);
+        container->registerServiceWorker(getScriptState(), "/x/y/worker.js", options);
 
         EXPECT_EQ(1ul, stubProvider.registerCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/y/")), stubProvider.registerScope());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/y/worker.js")), stubProvider.registerScriptURL());
     }
 
     container->willBeDetachedFromFrame();
 }
 
 TEST_F(ServiceWorkerContainerTest, GetRegistration_OmittedDocumentURLDefaultsToPageURL)
 {
     setPageURL("http://localhost/x/index.html");
 
     StubWebServiceWorkerProvider stubProvider;
     provide(stubProvider.provider());
 
-    ServiceWorkerContainer* container = ServiceWorkerContainer::create(executionContext());
+    ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
 
     {
-        ScriptState::Scope scriptScope(scriptState());
-        container->getRegistration(scriptState(), "");
+        ScriptState::Scope scriptScope(getScriptState());
+        container->getRegistration(getScriptState(), "");
         EXPECT_EQ(1ul, stubProvider.getRegistrationCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/index.html")), stubProvider.getRegistrationURL());
     }
 
     container->willBeDetachedFromFrame();
 }
 
 } // namespace
 } // namespace blink