Move IndexedDBKey, IndexedDBKeyRange into content namespace

content/common/indexed_db/proxy_webidbobjectstore_impl.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/proxy_webidbobjectstore_impl.h"
 
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/public/common/serialized_script_value.h"
 #include "content/common/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/indexed_db/proxy_webidbindex_impl.h"
 #include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
 #include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
+using content::IndexedDBKeyPath;
+using content::SerializedScriptValue;
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
 using WebKit::WebFrame;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBKeyPath;
 using WebKit::WebIDBKeyRange;
 using WebKit::WebIDBIndex;
 using WebKit::WebIDBKey;
 using WebKit::WebIDBTransaction;
 using WebKit::WebSerializedScriptValue;
@@ skipping 14 matching lines @@
 }
 
 WebString RendererWebIDBObjectStoreImpl::name() const {
   string16 result;
   IndexedDBDispatcher::Send(
       new IndexedDBHostMsg_ObjectStoreName(idb_object_store_id_, &result));
   return result;
 }
 
 WebIDBKeyPath RendererWebIDBObjectStoreImpl::keyPath() const {
-  content::IndexedDBKeyPath result;
+  IndexedDBKeyPath result;
   IndexedDBDispatcher::Send(
       new IndexedDBHostMsg_ObjectStoreKeyPath(idb_object_store_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
   std::vector<string16> result;
   IndexedDBDispatcher::Send(
       new IndexedDBHostMsg_ObjectStoreIndexNames(
           idb_object_store_id_, &result));
   WebDOMStringList web_result;
   for (std::vector<string16>::const_iterator it = result.begin();
        it != result.end(); ++it) {
     web_result.append(*it);
   }
   return web_result;
 }
 
 void RendererWebIDBObjectStoreImpl::get(
     const WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreGet(
-      IndexedDBKeyRange(key_range), callbacks,
+      content::IndexedDBKeyRange(key_range), callbacks,
       idb_object_store_id_, transaction, &ec);
 }
 
 void RendererWebIDBObjectStoreImpl::put(
     const WebSerializedScriptValue& value,
     const WebIDBKey& key,
     PutMode put_mode,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStorePut(
-      content::SerializedScriptValue(value), IndexedDBKey(key), put_mode,
-      callbacks, idb_object_store_id_, transaction, &ec);
+      SerializedScriptValue(value), content::IndexedDBKey(key),
+      put_mode, callbacks, idb_object_store_id_, transaction, &ec);
 }
 
 void RendererWebIDBObjectStoreImpl::deleteFunction(
     const WebIDBKey& key,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreDelete(
-      IndexedDBKey(key), callbacks, idb_object_store_id_, transaction, &ec);
+      content::IndexedDBKey(key), callbacks, idb_object_store_id_,
+      transaction, &ec);
 }
 
 void RendererWebIDBObjectStoreImpl::deleteFunction(
     const WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreDeleteRange(
-      IndexedDBKeyRange(key_range), callbacks, idb_object_store_id_,
+      content::IndexedDBKeyRange(key_range), callbacks, idb_object_store_id_,
       transaction, &ec);
 }
 
 void RendererWebIDBObjectStoreImpl::clear(
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreClear(
       callbacks, idb_object_store_id_, transaction, &ec);
 }
 
 WebIDBIndex* RendererWebIDBObjectStoreImpl::createIndex(
     const WebString& name,
     const WebIDBKeyPath& key_path,
     bool unique,
     bool multi_entry,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBHostMsg_ObjectStoreCreateIndex_Params params;
   params.name = name;
-  params.key_path = content::IndexedDBKeyPath(key_path);
+  params.key_path = IndexedDBKeyPath(key_path);
   params.unique = unique;
   params.multi_entry = multi_entry;
   params.transaction_id = IndexedDBDispatcher::TransactionId(transaction);
   params.idb_object_store_id = idb_object_store_id_;
 
   int32 index_id;
   IndexedDBDispatcher::Send(
       new IndexedDBHostMsg_ObjectStoreCreateIndex(params, &index_id, &ec));
   if (!index_id)
     return NULL;
@@ skipping 38 matching lines @@
     const WebIDBKeyRange& idb_key_range,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreCount(
       idb_key_range, callbacks,  idb_object_store_id_,
       transaction, &ec);
 }