Index: content/child/indexed_db/indexed_db_dispatcher_unittest.cc |
diff --git a/content/child/indexed_db/indexed_db_dispatcher_unittest.cc b/content/child/indexed_db/indexed_db_dispatcher_unittest.cc |
index 1df68d80c94006894a72ea30adfb4b4d8d2b06e4..9ff8890d69fc98745de9ffb97714880bd64872b6 100644 |
--- a/content/child/indexed_db/indexed_db_dispatcher_unittest.cc |
+++ b/content/child/indexed_db/indexed_db_dispatcher_unittest.cc |
@@ -13,9 +13,11 @@ |
#include "content/common/indexed_db/indexed_db_messages.h" |
#include "ipc/ipc_sync_message_filter.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "third_party/WebKit/public/platform/WebBlobInfo.h" |
#include "third_party/WebKit/public/platform/WebData.h" |
#include "third_party/WebKit/public/platform/WebIDBCallbacks.h" |
+using blink::WebBlobInfo; |
using blink::WebData; |
using blink::WebIDBCallbacks; |
using blink::WebIDBCursor; |
@@ -31,7 +33,9 @@ class MockCallbacks : public WebIDBCallbacks { |
public: |
MockCallbacks() : error_seen_(false) {} |
- virtual void onError(const WebIDBDatabaseError&) { error_seen_ = true; } |
+ virtual void onError(const WebIDBDatabaseError&) OVERRIDE { |
jsbell
2014/04/09 20:11:08
IIRC, in content/ we don't typically mark override
ericu
2014/04/09 21:14:47
Gotcha; reverted.
|
+ error_seen_ = true; |
+ } |
bool error_seen() const { return error_seen_; } |
@@ -71,6 +75,7 @@ class IndexedDBDispatcherTest : public testing::Test { |
TEST_F(IndexedDBDispatcherTest, ValueSizeTest) { |
const std::vector<char> data(kMaxIDBValueSizeInBytes + 1); |
const WebData value(&data.front(), data.size()); |
+ const WebVector<WebBlobInfo> webBlobInfo; |
jsbell
2014/04/09 20:11:08
Should be snake_case here (and below)
ericu
2014/04/09 21:14:47
Done.
|
const int32 ipc_dummy_id = -1; |
const int64 transaction_id = 1; |
const int64 object_store_id = 2; |
@@ -82,6 +87,7 @@ TEST_F(IndexedDBDispatcherTest, ValueSizeTest) { |
transaction_id, |
object_store_id, |
value, |
+ webBlobInfo, |
key, |
WebIDBDatabase::AddOrUpdate, |
&callbacks, |
@@ -96,6 +102,7 @@ TEST_F(IndexedDBDispatcherTest, KeyAndValueSizeTest) { |
const std::vector<char> data(kMaxIDBValueSizeInBytes - kKeySize); |
const WebData value(&data.front(), data.size()); |
+ const WebVector<WebBlobInfo> webBlobInfo; |
const IndexedDBKey key( |
base::string16(kKeySize / sizeof(base::string16::value_type), 'x')); |
@@ -109,6 +116,7 @@ TEST_F(IndexedDBDispatcherTest, KeyAndValueSizeTest) { |
transaction_id, |
object_store_id, |
value, |
+ webBlobInfo, |
key, |
WebIDBDatabase::AddOrUpdate, |
&callbacks, |
@@ -124,11 +132,11 @@ class CursorCallbacks : public WebIDBCallbacks { |
public: |
CursorCallbacks(scoped_ptr<WebIDBCursor>* cursor) : cursor_(cursor) {} |
- virtual void onSuccess(const WebData&) {} |
+ virtual void onSuccess(const WebData&) OVERRIDE {} |
virtual void onSuccess(WebIDBCursor* cursor, |
const WebIDBKey& key, |
const WebIDBKey& primaryKey, |
- const WebData& value) { |
+ const WebData& value) OVERRIDE { |
cursor_->reset(cursor); |
} |