third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp - Issue 1264453002: Split the constructor of ThreadableLoader into two methods (ctor and start())

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

Issue 1264453002: Split the constructor of ThreadableLoader into two methods (ctor and start()) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Removed pipes around non-variables in a comment Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

diff --git a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

index 988639468c6f360ce43029a56535d49a09c226b9..1e80822c7ba7c9bef17e587f036a280e8405e106 100644

--- a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

+++ b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

@@ -51,7 +51,7 @@ using Checkpoint = StrictMock<::testing::MockFunction<void(int)>>;

class MockLoaderFactory : public FetchBlobDataConsumerHandle::LoaderFactory {

public:

- MOCK_METHOD5(create, PassRefPtr<ThreadableLoader>(ExecutionContext&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));

+ MOCK_METHOD4(create, PassRefPtr<ThreadableLoader>(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));

};

PassRefPtr<BlobDataHandle> createBlobDataHandle(const char* s)

@@ -97,11 +97,11 @@ TEST_F(FetchBlobDataConsumerHandleTest, CreateLoader)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(

- SaveArg<2>(&request),

- SaveArg<3>(&options),

- SaveArg<4>(&resourceLoaderOptions),

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(

+ SaveArg<2>(&options),

+ SaveArg<3>(&resourceLoaderOptions),

Return(loader.get())));

+ EXPECT_CALL(*loader, start(_)).WillOnce(SaveArg<0>(&request));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

@@ -141,7 +141,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenStopped)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

EXPECT_CALL(checkpoint, Call(3));

@@ -169,7 +170,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenDestinationDetached)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(checkpoint, Call(3));

EXPECT_CALL(*loader, cancel());

@@ -203,7 +205,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, ReadTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

@@ -240,7 +243,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, TwoPhaseReadTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

@@ -277,7 +281,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, LoadErrorTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");

@@ -305,7 +310,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, BodyLoadErrorTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());