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

third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp

Index: third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
index d50a7c441af412f4a480c5d5986a2cba15bf6819..c46d7b11994fa3cc32aa91e0d4d4ee3c765d4da5 100644
--- a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
@@ -32,8 +32,8 @@ public:
     ~BodyStreamBufferTest() override {}
 
 protected:
-    ScriptState* scriptState() { return ScriptState::forMainWorld(m_page->document().frame()); }
-    ExecutionContext* executionContext() { return &m_page->document(); }
+    ScriptState* getScriptState() { return ScriptState::forMainWorld(m_page->document().frame()); }
+    ExecutionContext* getExecutionContext() { return &m_page->document(); }
 
     OwnPtr<DummyPageHolder> m_page;
 };
@@ -49,7 +49,7 @@ TEST_F(BodyStreamBufferTest, ReleaseHandle)
     EXPECT_FALSE(buffer->stream()->isDisturbed());
     EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
 
-    OwnPtr<FetchDataConsumerHandle> handle2 = buffer->releaseHandle(executionContext());
+    OwnPtr<FetchDataConsumerHandle> handle2 = buffer->releaseHandle(getExecutionContext());
 
     ASSERT_EQ(rawHandle, handle2.get());
     EXPECT_TRUE(buffer->stream()->isLocked());
@@ -72,7 +72,7 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsArrayBuffer)
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
-    buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), client);
+    buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), client);
 
     EXPECT_TRUE(buffer->stream()->isLocked());
     EXPECT_TRUE(buffer->stream()->isDisturbed());
@@ -104,7 +104,7 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsBlob)
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
-    buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsBlobHandle("text/plain"), client);
+    buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsBlobHandle("text/plain"), client);
 
     EXPECT_TRUE(buffer->stream()->isLocked());
     EXPECT_TRUE(buffer->stream()->isDisturbed());
@@ -134,7 +134,7 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsString)
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
-    buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client);
+    buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
 
     EXPECT_TRUE(buffer->stream()->isLocked());
     EXPECT_TRUE(buffer->stream()->isDisturbed());
@@ -160,7 +160,7 @@ TEST_F(BodyStreamBufferTest, ReleaseClosedHandle)
     EXPECT_FALSE(buffer->stream()->isLocked());
     EXPECT_FALSE(buffer->stream()->isDisturbed());
     EXPECT_FALSE(buffer->hasPendingActivity());
-    OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(executionContext());
+    OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(getExecutionContext());
 
     EXPECT_TRUE(handle);
     EXPECT_TRUE(buffer->stream()->isLocked());
@@ -188,7 +188,7 @@ TEST_F(BodyStreamBufferTest, LoadClosedHandle)
     EXPECT_FALSE(buffer->stream()->isDisturbed());
     EXPECT_FALSE(buffer->hasPendingActivity());
 
-    buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client);
+    buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
     EXPECT_TRUE(buffer->stream()->isLocked());
     EXPECT_TRUE(buffer->stream()->isDisturbed());
     EXPECT_TRUE(buffer->hasPendingActivity());
@@ -213,7 +213,7 @@ TEST_F(BodyStreamBufferTest, ReleaseErroredHandle)
     EXPECT_FALSE(buffer->stream()->isLocked());
     EXPECT_FALSE(buffer->stream()->isDisturbed());
     EXPECT_FALSE(buffer->hasPendingActivity());
-    OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(executionContext());
+    OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(getExecutionContext());
     EXPECT_TRUE(handle);
     EXPECT_TRUE(buffer->stream()->isLocked());
     EXPECT_TRUE(buffer->stream()->isDisturbed());
@@ -239,7 +239,7 @@ TEST_F(BodyStreamBufferTest, LoadErroredHandle)
     EXPECT_FALSE(buffer->stream()->isLocked());
     EXPECT_FALSE(buffer->stream()->isDisturbed());
     EXPECT_FALSE(buffer->hasPendingActivity());
-    buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client);
+    buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
     EXPECT_TRUE(buffer->stream()->isLocked());
     EXPECT_TRUE(buffer->stream()->isDisturbed());
     EXPECT_TRUE(buffer->hasPendingActivity());
@@ -267,7 +267,7 @@ TEST_F(BodyStreamBufferTest, LoaderShouldBeKeptAliveByBodyStreamBuffer)
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     Persistent<BodyStreamBuffer> buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
-    buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client);
+    buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
 
     Heap::collectAllGarbage();
     checkpoint.Call(1);
@@ -290,7 +290,7 @@ public:
 
 TEST_F(BodyStreamBufferTest, SourceHandleAndReaderShouldBeDestructedWhenCanceled)
 {
-    ScriptState::Scope scope(scriptState());
+    ScriptState::Scope scope(getScriptState());
     using MockHandle = MockFetchDataConsumerHandleWithMockDestructor;
     using MockReader = DataConsumerHandleTestUtil::MockFetchDataConsumerReader;
     OwnPtr<MockHandle> handle = MockHandle::create();
@@ -310,8 +310,8 @@ TEST_F(BodyStreamBufferTest, SourceHandleAndReaderShouldBeDestructedWhenCanceled
 
     BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
     checkpoint.Call(1);
-    ScriptValue reason(scriptState(), v8String(scriptState()->isolate(), "reason"));
-    buffer->cancelSource(scriptState(), reason);
+    ScriptValue reason(getScriptState(), v8String(getScriptState()->isolate(), "reason"));
+    buffer->cancelSource(getScriptState(), reason);
     checkpoint.Call(2);
 }