Commit 3ccd631d authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

Take advantage of gmock's support for move-only types in mock functions.

Bug: 759710
Change-Id: I595c8a031dbf3b890056024c5f8ac09b355ee7f0
Reviewed-on: https://chromium-review.googlesource.com/1033921Reviewed-by: default avatarDaniel Murphy <dmurph@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554908}
parent eacee030
...@@ -18,17 +18,4 @@ std::unique_ptr<MockWebIDBDatabase> MockWebIDBDatabase::Create() { ...@@ -18,17 +18,4 @@ std::unique_ptr<MockWebIDBDatabase> MockWebIDBDatabase::Create() {
return base::WrapUnique(new MockWebIDBDatabase()); return base::WrapUnique(new MockWebIDBDatabase());
} }
void MockWebIDBDatabase::Put(long long transaction_id,
long long object_store_id,
const WebData& value,
const WebVector<WebBlobInfo>& web_blob_info,
WebIDBKeyView primary_key,
WebIDBPutMode put_mode,
WebIDBCallbacks* callbacks,
const WebVector<long long>& index_ids,
WebVector<WebIndexKeys> index_keys) {
DoPut(transaction_id, object_store_id, value, web_blob_info, primary_key,
put_mode, callbacks, index_ids, index_keys);
}
} // namespace blink } // namespace blink
...@@ -84,17 +84,7 @@ class MockWebIDBDatabase : public testing::StrictMock<WebIDBDatabase> { ...@@ -84,17 +84,7 @@ class MockWebIDBDatabase : public testing::StrictMock<WebIDBDatabase> {
bool key_only, bool key_only,
WebIDBCallbacks*)); WebIDBCallbacks*));
// Google Mock doesn't support methods with move-only arguments. MOCK_METHOD9(Put,
void Put(long long transaction_id,
long long object_store_id,
const WebData& value,
const WebVector<WebBlobInfo>&,
WebIDBKeyView primary_key,
WebIDBPutMode,
WebIDBCallbacks*,
const WebVector<long long>& index_ids,
WebVector<WebIndexKeys>) override;
MOCK_METHOD9(DoPut,
void(long long transaction_id, void(long long transaction_id,
long long object_store_id, long long object_store_id,
const WebData& value, const WebData& value,
...@@ -103,7 +93,7 @@ class MockWebIDBDatabase : public testing::StrictMock<WebIDBDatabase> { ...@@ -103,7 +93,7 @@ class MockWebIDBDatabase : public testing::StrictMock<WebIDBDatabase> {
WebIDBPutMode, WebIDBPutMode,
WebIDBCallbacks*, WebIDBCallbacks*,
const WebVector<long long>& index_ids, const WebVector<long long>& index_ids,
const WebVector<WebIndexKeys>&)); const WebVector<WebIndexKeys>));
MOCK_METHOD5(SetIndexKeys, MOCK_METHOD5(SetIndexKeys,
void(long long transaction_id, void(long long transaction_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment