IndexedDB: Remove uses of WebKit API types from back-end code

content/browser/indexed_db/webidbdatabase_impl.cc

 // Copyright (c) 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 "content/browser/indexed_db/webidbdatabase_impl.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
+#include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-
-using WebKit::WebString;
-using WebKit::WebIDBDatabaseError;
 
 namespace content {
 
 WebIDBDatabaseImpl::WebIDBDatabaseImpl(
     scoped_refptr<IndexedDBDatabase> database_backend,
     scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks)
     : database_backend_(database_backend),
       database_callbacks_(database_callbacks) {}
 
 WebIDBDatabaseImpl::~WebIDBDatabaseImpl() {}
 
 void WebIDBDatabaseImpl::createObjectStore(long long transaction_id,
                                            long long object_store_id,
-                                           const WebString& name,
+                                           const string16& name,
                                            const IndexedDBKeyPath& key_path,
                                            bool auto_increment) {
   database_backend_->CreateObjectStore(transaction_id,
                                        object_store_id,
                                        name,
                                        IndexedDBKeyPath(key_path),
                                        auto_increment);
 }
 
 void WebIDBDatabaseImpl::deleteObjectStore(long long transaction_id,
@@ skipping 28 matching lines @@
   database_callbacks_->OnForcedClose();
   database_callbacks_ = NULL;
 }
 
 void WebIDBDatabaseImpl::abort(long long transaction_id) {
   if (database_backend_.get())
     database_backend_->Abort(transaction_id);
 }
 
 void WebIDBDatabaseImpl::abort(long long transaction_id,
-                               const WebIDBDatabaseError& error) {
+                               const IndexedDBDatabaseError& error) {
   if (database_backend_.get())
-    database_backend_->Abort(transaction_id, IndexedDBDatabaseError(error));
+    database_backend_->Abort(transaction_id, error);
 }
 
 void WebIDBDatabaseImpl::commit(long long transaction_id) {
   if (database_backend_.get())
     database_backend_->Commit(transaction_id);
 }
 
 void WebIDBDatabaseImpl::openCursor(long long transaction_id,
                                     long long object_store_id,
                                     long long index_id,
@@ skipping 114 matching lines @@
                                IndexedDBCallbacksBase* callbacks) {
   if (database_backend_.get())
     database_backend_->Clear(transaction_id,
                              object_store_id,
                              IndexedDBCallbacksWrapper::Create(callbacks));
 }
 
 void WebIDBDatabaseImpl::createIndex(long long transaction_id,
                                      long long object_store_id,
                                      long long index_id,
-                                     const WebString& name,
+                                     const string16& name,
                                      const IndexedDBKeyPath& key_path,
                                      bool unique,
                                      bool multi_entry) {
   if (database_backend_.get())
     database_backend_->CreateIndex(transaction_id,
                                    object_store_id,
                                    index_id,
                                    name,
                                    IndexedDBKeyPath(key_path),
                                    unique,
                                    multi_entry);
 }
 
 void WebIDBDatabaseImpl::deleteIndex(long long transaction_id,
                                      long long object_store_id,
                                      long long index_id) {
   if (database_backend_.get())
     database_backend_->DeleteIndex(transaction_id, object_store_id, index_id);
 }
 
 }  // namespace WebKit