Move IndexedDBKey, IndexedDBKeyRange into content namespace

content/common/indexed_db/indexed_db_dispatcher.cc

 // 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.
 
 #include "content/common/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/common/indexed_db/proxy_webidbcursor_impl.h"
 #include "content/common/indexed_db/proxy_webidbdatabase_impl.h"
 #include "content/common/indexed_db/proxy_webidbindex_impl.h"
 #include "content/common/indexed_db/proxy_webidbobjectstore_impl.h"
 #include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseException.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
 
 using base::ThreadLocalPointer;
+using content::IndexedDBKey;
+using content::IndexedDBKeyRange;
+using content::SerializedScriptValue;
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
 using WebKit::WebFrame;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBKeyRange;
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBDatabaseCallbacks;
 using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBTransaction;
 using WebKit::WebIDBTransactionCallbacks;
@@ skipping 78 matching lines @@
 bool IndexedDBDispatcher::Send(IPC::Message* msg) {
   if (CurrentWorkerId()) {
     scoped_refptr<IPC::SyncMessageFilter> filter(
         ChildThread::current()->sync_message_filter());
     return filter->Send(msg);
   }
   return ChildThread::current()->Send(msg);
 }
 
 void IndexedDBDispatcher::RequestIDBCursorUpdate(
-    const content::SerializedScriptValue& value,
+    const SerializedScriptValue& value,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_cursor_id,
     WebExceptionCode* ec) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   if (!value.is_null() &&
       (value.data().length() * sizeof(char16)) > kMaxIDBValueSizeInBytes) {
     *ec = WebKit::WebIDBDatabaseExceptionDataError;
     return;
   }
@@ skipping 272 matching lines @@
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   Send(new IndexedDBHostMsg_ObjectStoreGet(
            idb_object_store_id, CurrentWorkerId(), response_id,
            key_range, TransactionId(transaction), ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBObjectStorePut(
-    const content::SerializedScriptValue& value,
+    const SerializedScriptValue& value,
     const IndexedDBKey& key,
     WebKit::WebIDBObjectStore::PutMode put_mode,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_object_store_id,
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   if (!value.is_null() &&
       (value.data().length() * sizeof(char16)) > kMaxIDBValueSizeInBytes) {
@@ skipping 124 matching lines @@
                                                int32 response_id,
                                                int32 object_id) {
   DCHECK_EQ(thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess(new RendererWebIDBDatabaseImpl(object_id));
   pending_callbacks_.Remove(response_id);
 }
 
-void IndexedDBDispatcher::OnSuccessIndexedDBKey(int32 thread_id,
-                                                int32 response_id,
-                                                const IndexedDBKey& key) {
+void IndexedDBDispatcher::OnSuccessIndexedDBKey(
+    int32 thread_id,
+    int32 response_id,
+    const IndexedDBKey& key) {
   DCHECK_EQ(thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess(key);
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessIDBTransaction(int32 thread_id,
                                                   int32 response_id,
@@ skipping 15 matching lines @@
   WebDOMStringList string_list;
   for (std::vector<string16>::const_iterator it = value.begin();
        it != value.end(); ++it)
       string_list.append(*it);
   callbacks->onSuccess(string_list);
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessSerializedScriptValue(
     int32 thread_id, int32 response_id,
-    const content::SerializedScriptValue& value) {
+    const SerializedScriptValue& value) {
   DCHECK_EQ(thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess(value);
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessOpenCursor(
     const IndexedDBMsg_CallbacksSuccessIDBCursor_Params& p) {
   DCHECK_EQ(p.thread_id, CurrentWorkerId());
   int32 response_id = p.response_id;
   int32 object_id = p.cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
-  const content::SerializedScriptValue& value = p.serialized_value;
+  const SerializedScriptValue& value = p.serialized_value;
 
   WebIDBCallbacks* callbacks =
       pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
 
   RendererWebIDBCursorImpl* cursor = new RendererWebIDBCursorImpl(object_id);
   cursors_[object_id] = cursor;
   cursor->SetKeyAndValue(key, primary_key, value);
   callbacks->onSuccess(cursor);
 
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessCursorContinue(
     const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p) {
   DCHECK_EQ(p.thread_id, CurrentWorkerId());
   int32 response_id = p.response_id;
   int32 cursor_id = p.cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
-  const content::SerializedScriptValue& value = p.serialized_value;
+  const SerializedScriptValue& value = p.serialized_value;
 
   RendererWebIDBCursorImpl* cursor = cursors_[cursor_id];
   DCHECK(cursor);
   cursor->SetKeyAndValue(key, primary_key, value);
 
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
   callbacks->onSuccessWithContinuation();
 
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessCursorPrefetch(
     const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p) {
   DCHECK_EQ(p.thread_id, CurrentWorkerId());
   int32 response_id = p.response_id;
   int32 cursor_id = p.cursor_id;
   const std::vector<IndexedDBKey>& keys = p.keys;
   const std::vector<IndexedDBKey>& primary_keys = p.primary_keys;
-  const std::vector<content::SerializedScriptValue>& values = p.values;
+  const std::vector<SerializedScriptValue>& values = p.values;
   RendererWebIDBCursorImpl* cursor = cursors_[cursor_id];
   DCHECK(cursor);
   cursor->SetPrefetchData(keys, primary_keys, values);
 
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   DCHECK(callbacks);
   cursor->CachedContinue(callbacks);
   pending_callbacks_.Remove(response_id);
 }
 
@@ skipping 48 matching lines @@
 }
 
 void IndexedDBDispatcher::ResetCursorPrefetchCaches(int32 exception_cursor_id) {
   typedef std::map<int32, RendererWebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }