Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2228433002: Revert of Move ThreadableLoader to Oilpan heap (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onheap-bridge-peer-in-worker-threadable-loader
Patch Set: Created 4 years, 4 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') | Show Comments 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 b49316cadfc7d072962900eae4f12073d30c9d11..50c03d4bab570fceaa206d45149246ba1e582680 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp
@@ -53,7 +53,12 @@
class MockLoaderFactory : public FetchBlobDataConsumerHandle::LoaderFactory {
public:
- MOCK_METHOD4(create, ThreadableLoader*(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));
+ std::unique_ptr<ThreadableLoader> create(ExecutionContext& executionContext, ThreadableLoaderClient* client, const ThreadableLoaderOptions& threadableLoaderOptions, const ResourceLoaderOptions& resourceLoaderOptions) override
+ {
+ return wrapUnique(createInternal(executionContext, client, threadableLoaderOptions, resourceLoaderOptions));
+ }
+
+ MOCK_METHOD4(createInternal, ThreadableLoader*(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));
};
PassRefPtr<BlobDataHandle> createBlobDataHandle(const char* s)
@@ -95,17 +100,18 @@
ThreadableLoaderOptions options;
ResourceLoaderOptions resourceLoaderOptions;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
-
- InSequence s;
- EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
+
+ InSequence s;
+ EXPECT_CALL(checkpoint, Call(1));
+ EXPECT_CALL(*factory, createInternal(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());
+ Return(loader.release())));
+ EXPECT_CALL(*loaderPtr, start(_)).WillOnce(SaveArg<0>(&request));
+ EXPECT_CALL(checkpoint, Call(2));
+ EXPECT_CALL(*loaderPtr, cancel());
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
std::unique_ptr<WebDataConsumerHandle> handle
@@ -139,14 +145,15 @@
auto factory = new StrictMock<MockLoaderFactory>;
Checkpoint checkpoint;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
-
- InSequence s;
- EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(Return(loader.get()));
- EXPECT_CALL(*loader, start(_));
- EXPECT_CALL(checkpoint, Call(2));
- EXPECT_CALL(*loader, cancel());
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
+
+ InSequence s;
+ EXPECT_CALL(checkpoint, Call(1));
+ EXPECT_CALL(*factory, createInternal(Ref(document()), _, _, _)).WillOnce(Return(loader.release()));
+ EXPECT_CALL(*loaderPtr, start(_));
+ EXPECT_CALL(checkpoint, Call(2));
+ EXPECT_CALL(*loaderPtr, cancel());
EXPECT_CALL(checkpoint, Call(3));
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
@@ -168,15 +175,16 @@
auto factory = new StrictMock<MockLoaderFactory>;
Checkpoint checkpoint;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
-
- InSequence s;
- EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(Return(loader.get()));
- EXPECT_CALL(*loader, start(_));
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
+
+ InSequence s;
+ EXPECT_CALL(checkpoint, Call(1));
+ EXPECT_CALL(*factory, createInternal(Ref(document()), _, _, _)).WillOnce(Return(loader.release()));
+ EXPECT_CALL(*loaderPtr, start(_));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(checkpoint, Call(3));
- EXPECT_CALL(*loader, cancel());
+ EXPECT_CALL(*loaderPtr, cancel());
EXPECT_CALL(checkpoint, Call(4));
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
@@ -202,15 +210,16 @@
auto factory = new StrictMock<MockLoaderFactory>;
Checkpoint checkpoint;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
ThreadableLoaderClient* client = nullptr;
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- 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());
+ EXPECT_CALL(*factory, createInternal(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.release())));
+ EXPECT_CALL(*loaderPtr, start(_));
+ EXPECT_CALL(checkpoint, Call(2));
+ EXPECT_CALL(*loaderPtr, cancel());
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
std::unique_ptr<WebDataConsumerHandle> handle
@@ -240,15 +249,16 @@
auto factory = new StrictMock<MockLoaderFactory>;
Checkpoint checkpoint;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
ThreadableLoaderClient* client = nullptr;
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- 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());
+ EXPECT_CALL(*factory, createInternal(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.release())));
+ EXPECT_CALL(*loaderPtr, start(_));
+ EXPECT_CALL(checkpoint, Call(2));
+ EXPECT_CALL(*loaderPtr, cancel());
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
std::unique_ptr<WebDataConsumerHandle> handle
@@ -278,13 +288,14 @@
auto factory = new StrictMock<MockLoaderFactory>;
Checkpoint checkpoint;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
ThreadableLoaderClient* client = nullptr;
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));
- EXPECT_CALL(*loader, start(_));
+ EXPECT_CALL(*factory, createInternal(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.release())));
+ EXPECT_CALL(*loaderPtr, start(_));
EXPECT_CALL(checkpoint, Call(2));
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
@@ -307,15 +318,16 @@
auto factory = new StrictMock<MockLoaderFactory>;
Checkpoint checkpoint;
- Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
+ std::unique_ptr<MockThreadableLoader> loader = MockThreadableLoader::create();
+ MockThreadableLoader* loaderPtr = loader.get();
ThreadableLoaderClient* client = nullptr;
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- 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());
+ EXPECT_CALL(*factory, createInternal(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.release())));
+ EXPECT_CALL(*loaderPtr, start(_));
+ EXPECT_CALL(checkpoint, Call(2));
+ EXPECT_CALL(*loaderPtr, cancel());
RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
std::unique_ptr<WebDataConsumerHandle> handle
« 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 »

Powered by Google App Engine
This is Rietveld 408576698