Move IndexedDBKey, IndexedDBKeyRange into content namespace

content/common/indexed_db/indexed_db_dispatcher.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/nullable_string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
 #include "webkit/glue/worker_task_runner.h"
 
-class IndexedDBKey;
-class IndexedDBKeyRange;
 struct IndexedDBMsg_CallbacksSuccessCursorContinue_Params;
 struct IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params;
 struct IndexedDBMsg_CallbacksSuccessIDBCursor_Params;
 class RendererWebIDBCursorImpl;
 
 namespace IPC {
 class Message;
 }
 
 namespace WebKit {
 class WebFrame;
 class WebIDBKeyRange;
 class WebIDBTransaction;
 }
 
 namespace content {
+class IndexedDBKey;
+class IndexedDBKeyRange;
 class SerializedScriptValue;
 }
 
 CONTENT_EXPORT extern const size_t kMaxIDBValueSizeInBytes;
 
 // Handle the indexed db related communication for this context thread - the
 // main thread and each worker thread have their own copies.
 class CONTENT_EXPORT IndexedDBDispatcher
     : public webkit_glue::WorkerTaskRunner::Observer {
  public:
@@ skipping 34 matching lines @@
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBCursorAdvance(
       unsigned long count,
       WebKit::WebIDBCallbacks* callbacks_ptr,
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBCursorContinue(
-      const IndexedDBKey& key,
+      const content::IndexedDBKey& key,
       WebKit::WebIDBCallbacks* callbacks_ptr,
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBCursorPrefetch(
       int n,
       WebKit::WebIDBCallbacks* callbacks_ptr,
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
 
@@ skipping 35 matching lines @@
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBIndexCount(
       const WebKit::WebIDBKeyRange& idb_key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_index_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBIndexGetObject(
-      const IndexedDBKeyRange& key_range,
+      const content::IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_index_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBIndexGetKey(
-      const IndexedDBKeyRange& key_range,
+      const content::IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_index_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreGet(
-      const IndexedDBKeyRange& key_range,
+      const content::IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStorePut(const content::SerializedScriptValue& value,
-                                const IndexedDBKey& key,
+                                const content::IndexedDBKey& key,
                                 WebKit::WebIDBObjectStore::PutMode putMode,
                                 WebKit::WebIDBCallbacks* callbacks,
                                 int32 idb_object_store_id,
                                 const WebKit::WebIDBTransaction& transaction,
                                 WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreDelete(
-      const IndexedDBKey& key,
+      const content::IndexedDBKey& key,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreDeleteRange(
-      const IndexedDBKeyRange& key_range,
+      const content::IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreClear(
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
@@ skipping 24 matching lines @@
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, ValueSizeTest);
 
   // IDBCallback message handlers.
   void OnSuccessNull(int32 response_id);
   void OnSuccessIDBDatabase(int32 thread_id,
                             int32 response_id,
                             int32 object_id);
   void OnSuccessIndexedDBKey(int32 thread_id,
                              int32 response_id,
-                             const IndexedDBKey& key);
+                             const content::IndexedDBKey& key);
   void OnSuccessIDBTransaction(int32 thread_id,
                                int32 response_id,
                                int32 object_id);
   void OnSuccessOpenCursor(
       const IndexedDBMsg_CallbacksSuccessIDBCursor_Params& p);
   void OnSuccessCursorContinue(
       const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p);
   void OnSuccessCursorPrefetch(
       const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p);
   void OnSuccessStringList(int32 thread_id,
@@ skipping 25 matching lines @@
   IDMap<WebKit::WebIDBDatabaseCallbacks, IDMapOwnPointer>
       pending_database_callbacks_;
 
   // Map from cursor id to RendererWebIDBCursorImpl.
   std::map<int32, RendererWebIDBCursorImpl*> cursors_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 #endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_