[IndexedDB] Use consistent enums on both sides of IPC.

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"
@@ skipping 75 matching lines @@
 
   MockCallbacks callbacks;
   IndexedDBDispatcher dispatcher(thread_safe_sender_.get());
   IndexedDBKey key(0, blink::WebIDBKeyTypeNumber);
   dispatcher.RequestIDBDatabasePut(ipc_dummy_id,
                                    transaction_id,
                                    object_store_id,
                                    value,
                                    web_blob_info,
                                    key,
-                                   WebIDBDatabase::AddOrUpdate,
+                                   blink::WebIDBPutModeAddOrUpdate,
                                    &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> web_blob_info;
   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,
                                    web_blob_info,
                                    key,
-                                   WebIDBDatabase::AddOrUpdate,
+                                   blink::WebIDBPutModeAddOrUpdate,
                                    &callbacks,
                                    WebVector<long long>(),
                                    WebVector<WebVector<WebIDBKey> >());
 
   EXPECT_TRUE(callbacks.error_seen());
 }
 
 namespace {
 
 class CursorCallbacks : public WebIDBCallbacks {
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CursorCallbacks);
 };
 
 }  // namespace
 
 TEST_F(IndexedDBDispatcherTest, CursorTransactionId) {
   const int32 ipc_database_id = -1;
   const int64 transaction_id = 1234;
   const int64 object_store_id = 2;
   const int32 index_id = 3;
-  const WebIDBCursor::Direction direction = WebIDBCursor::Next;
+  const blink::WebIDBCursorDirection direction =
+      blink::WebIDBCursorDirectionNext;
   const bool key_only = false;
 
   MockDispatcher dispatcher(thread_safe_sender_.get());
 
   // First case: successful cursor open.
   {
     scoped_ptr<WebIDBCursor> cursor;
     EXPECT_EQ(0UL, dispatcher.cursor_transaction_ids_.size());
 
     // Make a cursor request. This should record the transaction id.
     dispatcher.RequestIDBDatabaseOpenCursor(ipc_database_id,
                                             transaction_id,
                                             object_store_id,
                                             index_id,
                                             IndexedDBKeyRange(),
                                             direction,
                                             key_only,
-                                            blink::WebIDBDatabase::NormalTask,
+                                            blink::WebIDBTaskTypeNormal,
                                             new CursorCallbacks(&cursor));
 
     // Verify that the transaction id was captured.
     EXPECT_EQ(1UL, dispatcher.cursor_transaction_ids_.size());
     EXPECT_FALSE(cursor.get());
 
     int32 ipc_callbacks_id = dispatcher.cursor_transaction_ids_.begin()->first;
 
     IndexedDBMsg_CallbacksSuccessIDBCursor_Params params;
     params.ipc_thread_id = dispatcher.CurrentWorkerId();
@@ skipping 20 matching lines @@
     EXPECT_EQ(0UL, dispatcher.cursor_transaction_ids_.size());
 
     // Make a cursor request. This should record the transaction id.
     dispatcher.RequestIDBDatabaseOpenCursor(ipc_database_id,
                                             transaction_id,
                                             object_store_id,
                                             index_id,
                                             IndexedDBKeyRange(),
                                             direction,
                                             key_only,
-                                            blink::WebIDBDatabase::NormalTask,
+                                            blink::WebIDBTaskTypeNormal,
                                             new CursorCallbacks(&cursor));
 
     // Verify that the transaction id was captured.
     EXPECT_EQ(1UL, dispatcher.cursor_transaction_ids_.size());
     EXPECT_FALSE(cursor.get());
 
     int32 ipc_callbacks_id = dispatcher.cursor_transaction_ids_.begin()->first;
 
     // Now simululate a "null cursor" response.
     IndexedDBMsg_CallbacksSuccessValue_Params params;
@@ skipping 103 matching lines @@
                                       cursor1_transaction_id);
 
   EXPECT_EQ(2, cursor1->reset_count());
   EXPECT_EQ(0, cursor2->reset_count());
 
   cursor1.reset();
   cursor2.reset();
 }
 
 }  // namespace content