WebBlobInfo plumbing for WebIDBDatabaseImpl::put.

content/child/indexed_db/indexed_db_dispatcher_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/webidbcursor_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 #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;
 using blink::WebIDBDatabase;
 using blink::WebIDBDatabaseError;
 using blink::WebIDBKey;
 using blink::WebVector;
 
 namespace content {
 namespace {
 
 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 overrides of blink public API methods
with OVERRIDE, to ease in removing them.

(Although our typical 3-sided patch dance for IDB removes old blink APIs last,
so it's not an issue).

[ericu, 2014/04/09 21:14:47]

Gotcha; reverted.

+    error_seen_ = true;
+  }
 
   bool error_seen() const { return error_seen_; }
 
  private:
   bool error_seen_;
 };
 
 class MockDispatcher : public IndexedDBDispatcher {
  public:
   MockDispatcher(ThreadSafeSender* sender) : IndexedDBDispatcher(sender) {}
@@ skipping 19 matching lines @@
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcherTest);
 };
 
 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;
 
   MockCallbacks callbacks;
   IndexedDBDispatcher dispatcher(thread_safe_sender_.get());
   IndexedDBKey key(0, blink::WebIDBKeyTypeNumber);
   dispatcher.RequestIDBDatabasePut(ipc_dummy_id,
                                    transaction_id,
                                    object_store_id,
                                    value,
+                                   webBlobInfo,
                                    key,
                                    WebIDBDatabase::AddOrUpdate,
                                    &callbacks,
                                    WebVector<long long>(),
                                    WebVector<WebVector<WebIDBKey> >());
 
   EXPECT_TRUE(callbacks.error_seen());
 }
 
 TEST_F(IndexedDBDispatcherTest, KeyAndValueSizeTest) {
   const size_t kKeySize = 1024 * 1024;
 
   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'));
 
   const int32 ipc_dummy_id = -1;
   const int64 transaction_id = 1;
   const int64 object_store_id = 2;
 
   MockCallbacks callbacks;
   IndexedDBDispatcher dispatcher(thread_safe_sender_.get());
   dispatcher.RequestIDBDatabasePut(ipc_dummy_id,
                                    transaction_id,
                                    object_store_id,
                                    value,
+                                   webBlobInfo,
                                    key,
                                    WebIDBDatabase::AddOrUpdate,
                                    &callbacks,
                                    WebVector<long long>(),
                                    WebVector<WebVector<WebIDBKey> >());
 
   EXPECT_TRUE(callbacks.error_seen());
 }
 
 namespace {
 
 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);
   }
 
  private:
   scoped_ptr<WebIDBCursor>* cursor_;
 };
 
 }  // namespace
 
 TEST_F(IndexedDBDispatcherTest, CursorTransactionId) {
@@ skipping 175 matching lines @@
                                       cursor1_transaction_id);
 
   EXPECT_EQ(2, cursor1->reset_count());
   EXPECT_EQ(0, cursor2->reset_count());
 
   cursor1.reset();
   cursor2.reset();
 }
 
 }  // namespace content