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

Clean up almost everything except for enums.

BUG=233361,237267

Review URL: https://chromiumcodereview.appspot.com/17915004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209048 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 55 insertions, 79 deletions

diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc
index 8bcf80d..111d574 100644
--- a/content/browser/indexed_db/indexed_db_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_callbacks.cc
@@ -7,14 +7,13 @@
 #include <algorithm>
 #include <vector>
 
+#include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "webkit/browser/quota/quota_manager.h"
 
-using WebKit::WebData;
 using WebKit::WebIDBCallbacks;
-using WebKit::WebString;
 
 namespace content {
 
@@ -32,7 +31,7 @@ IndexedDBCallbacksBase::IndexedDBCallbacksBase(
 
 IndexedDBCallbacksBase::~IndexedDBCallbacksBase() {}
 
-void IndexedDBCallbacksBase::onError(const WebKit::WebIDBDatabaseError& error) {
+void IndexedDBCallbacksBase::onError(const IndexedDBDatabaseError& error) {
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksError(
       ipc_thread_id_, ipc_callbacks_id_, error.code(), error.message()));
 }
diff --git a/content/browser/indexed_db/indexed_db_callbacks.h b/content/browser/indexed_db/indexed_db_callbacks.h
index aed4561..948d32c 100644
--- a/content/browser/indexed_db/indexed_db_callbacks.h
+++ b/content/browser/indexed_db/indexed_db_callbacks.h
@@ -11,10 +11,9 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 
 namespace content {
+class IndexedDBDatabaseError;
 class WebIDBCursorImpl;
 class WebIDBDatabaseImpl;
 struct IndexedDBDatabaseMetadata;
@@ -23,7 +22,7 @@ class IndexedDBCallbacksBase {
  public:
   virtual ~IndexedDBCallbacksBase();
 
-  virtual void onError(const WebKit::WebIDBDatabaseError& error);
+  virtual void onError(const IndexedDBDatabaseError& error);
   virtual void onBlocked(long long old_version);
 
   // implemented by subclasses, but need to be called later
diff --git a/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc b/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc
index 7ee9213..f5d288c 100644
--- a/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc
+++ b/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc
@@ -8,7 +8,6 @@
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/browser/indexed_db/webidbcursor_impl.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
 
 namespace content {
 
@@ -22,8 +21,7 @@ IndexedDBCallbacksWrapper::~IndexedDBCallbacksWrapper() {}
 
 void IndexedDBCallbacksWrapper::OnError(const IndexedDBDatabaseError& error) {
   DCHECK(callbacks_);
-  callbacks_->onError(
-      WebKit::WebIDBDatabaseError(error.code(), error.message()));
+  callbacks_->onError(error);
   callbacks_.reset();
 }
 
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc
index c4d3c05..955b86f 100644
--- a/content/browser/indexed_db/indexed_db_context_impl.cc
+++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -22,7 +22,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/indexed_db_info.h"
 #include "content/public/common/content_switches.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/browser/database/database_util.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/special_storage_policy.h"
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks.cc b/content/browser/indexed_db/indexed_db_database_callbacks.cc
index 5fa52b3..fb74eed 100644
--- a/content/browser/indexed_db/indexed_db_database_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_database_callbacks.cc
@@ -5,9 +5,9 @@
 #include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 
 #include "base/memory/scoped_vector.h"
+#include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
 
 namespace content {
 
@@ -34,7 +34,7 @@ void IndexedDBDatabaseCallbacks::onVersionChange(long long old_version,
 
 void IndexedDBDatabaseCallbacks::onAbort(
     long long host_transaction_id,
-    const WebKit::WebIDBDatabaseError& error) {
+    const IndexedDBDatabaseError& error) {
   dispatcher_host_->FinishTransaction(host_transaction_id, false);
   dispatcher_host_->Send(new IndexedDBMsg_DatabaseCallbacksAbort(
       ipc_thread_id_,
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks.h b/content/browser/indexed_db/indexed_db_database_callbacks.h
index fe3df30..3a8b684 100644
--- a/content/browser/indexed_db/indexed_db_database_callbacks.h
+++ b/content/browser/indexed_db/indexed_db_database_callbacks.h
@@ -7,11 +7,8 @@
 
 #include "base/memory/ref_counted.h"
 
-namespace WebKit {
-class WebIDBDatabaseError;
-}
-
 namespace content {
+class IndexedDBDatabaseError;
 class IndexedDBDispatcherHost;
 
 class IndexedDBDatabaseCallbacks {
@@ -25,7 +22,7 @@ class IndexedDBDatabaseCallbacks {
   virtual void onForcedClose();
   virtual void onVersionChange(long long old_version, long long new_version);
   virtual void onAbort(long long host_transaction_id,
-                       const WebKit::WebIDBDatabaseError&);
+                       const IndexedDBDatabaseError& error);
   virtual void onComplete(long long host_transaction_id);
 
  private:
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.cc b/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.cc
index a5a2f67..3b3af70 100644
--- a/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.cc
+++ b/content/browser/indexed_db/indexed_db_database_callbacks_wrapper.cc
@@ -30,9 +30,7 @@ void IndexedDBDatabaseCallbacksWrapper::OnAbort(
     const IndexedDBDatabaseError& error) {
   if (!callbacks_)
     return;
-  callbacks_->onAbort(
-      transaction_id,
-      WebKit::WebIDBDatabaseError(error.code(), error.message()));
+  callbacks_->onAbort(transaction_id, error);
 }
 void IndexedDBDatabaseCallbacksWrapper::OnComplete(int64 transaction_id) {
   if (!callbacks_)
diff --git a/content/browser/indexed_db/indexed_db_database_error.h b/content/browser/indexed_db/indexed_db_database_error.h
index 3f5eef5..297bec7 100644
--- a/content/browser/indexed_db/indexed_db_database_error.h
+++ b/content/browser/indexed_db/indexed_db_database_error.h
@@ -8,18 +8,17 @@
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
 
 namespace content {
 
 class IndexedDBDatabaseError {
  public:
+  IndexedDBDatabaseError(uint16 code)
+      : code_(code) {}
   IndexedDBDatabaseError(uint16 code, const char* message)
       : code_(code), message_(ASCIIToUTF16(message)) {}
   IndexedDBDatabaseError(uint16 code, const string16& message)
       : code_(code), message_(message) {}
-  explicit IndexedDBDatabaseError(const WebKit::WebIDBDatabaseError& other)
-      : code_(other.code()), message_(other.message()) {}
   ~IndexedDBDatabaseError() {}
 
   uint16 code() const { return code_; }
diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc
index f5ad557..ac7b0bc 100644
--- a/content/browser/indexed_db/indexed_db_database_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_database_unittest.cc
@@ -21,8 +21,6 @@
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
 
-using WebKit::WebIDBDatabaseError;
-
 namespace content {
 
 TEST(IndexedDBDatabaseTest, BackingStoreRetention) {
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc
index 996f653..6351355 100644
--- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc
+++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc
@@ -27,13 +27,11 @@
 #include "content/public/common/result_codes.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h"
 #include "webkit/browser/database/database_util.h"
 #include "webkit/common/database/database_identifier.h"
 
 using webkit_database::DatabaseUtil;
-using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBKey;
 
 namespace content {
@@ -221,7 +219,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryGetDatabaseNames(
   Context()->GetIDBFactory()->getDatabaseNames(
       new IndexedDBCallbacks<std::vector<string16> >(
           this, params.ipc_thread_id, params.ipc_callbacks_id),
-      WebKit::WebString::fromUTF8(params.database_identifier),
+      base::UTF8ToUTF16(params.database_identifier),
       indexed_db_path.AsUTF16Unsafe());
 }
 
@@ -249,7 +247,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
                                             origin_url),
              new IndexedDBDatabaseCallbacks(
                  this, params.ipc_thread_id, params.ipc_database_callbacks_id),
-             WebKit::WebString::fromUTF8(params.database_identifier),
+             base::UTF8ToUTF16(params.database_identifier),
              indexed_db_path.AsUTF16Unsafe());
 }
 
@@ -262,7 +260,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(
       ->deleteDatabase(params.name,
                        new IndexedDBCallbacks<std::vector<char> >(
                            this, params.ipc_thread_id, params.ipc_callbacks_id),
-                       WebKit::WebString::fromUTF8(params.database_identifier),
+                       base::UTF8ToUTF16(params.database_identifier),
                        indexed_db_path.AsUTF16Unsafe());
 }
 
@@ -350,7 +348,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::CloseAll() {
     if (database) {
       database->abort(
           transaction_id,
-          WebIDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError));
+          IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError));
     }
   }
   DCHECK(transaction_database_map_.empty());
@@ -424,7 +422,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateObjectStore(
           database_url_map_[params.ipc_database_id])) {
     database->abort(
         host_transaction_id,
-        WebIDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError));
+        IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError));
   }
 }
 
@@ -551,7 +549,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnSetIndexKeys(
   if (params.index_ids.size() != params.index_keys.size()) {
     database->abort(
         host_transaction_id,
-        WebIDBDatabaseError(
+        IndexedDBDatabaseError(
             WebKit::WebIDBDatabaseExceptionUnknownError,
             "Malformed IPC message: index_ids.size() != index_keys.size()"));
     return;
@@ -691,7 +689,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCommit(
           transaction_url_map_[host_transaction_id], transaction_size)) {
     database->abort(
         host_transaction_id,
-        WebIDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError));
+        IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError));
     return;
   }
 
@@ -719,7 +717,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateIndex(
           database_url_map_[params.ipc_database_id])) {
     database->abort(
         host_transaction_id,
-        WebIDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError));
+        IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError));
   }
 }
 
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index 765fb50..c2b6e5c 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -23,7 +23,6 @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
 #include "grit/content_resources.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/zlib/google/zip.h"
 #include "webkit/common/database/database_identifier.h"
 
diff --git a/content/browser/indexed_db/webidbdatabase_impl.cc b/content/browser/indexed_db/webidbdatabase_impl.cc
index 0892ca6..6b1cc8a 100644
--- a/content/browser/indexed_db/webidbdatabase_impl.cc
+++ b/content/browser/indexed_db/webidbdatabase_impl.cc
@@ -11,13 +11,9 @@
 #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 {
 
@@ -31,7 +27,7 @@ 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,
@@ -80,9 +76,9 @@ void WebIDBDatabaseImpl::abort(long long 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) {
@@ -217,7 +213,7 @@ void WebIDBDatabaseImpl::clear(long long transaction_id,
 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) {
diff --git a/content/browser/indexed_db/webidbdatabase_impl.h b/content/browser/indexed_db/webidbdatabase_impl.h
index 6989d46..3420b07 100644
--- a/content/browser/indexed_db/webidbdatabase_impl.h
+++ b/content/browser/indexed_db/webidbdatabase_impl.h
@@ -10,16 +10,12 @@
 #include "content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
 
-namespace WebKit {
-class WebIDBDatabaseError;
-class WebIDBDatabaseMetadata;
-}
-
 namespace content {
 class IndexedDBCallbacksBase;
 class IndexedDBDatabase;
 class IndexedDBDatabaseCallbacks;
 class IndexedDBDatabaseCallbacksWrapper;
+class IndexedDBDatabaseError;
 
 class CONTENT_EXPORT WebIDBDatabaseImpl {
  public:
@@ -32,7 +28,7 @@ class CONTENT_EXPORT WebIDBDatabaseImpl {
 
   virtual void createObjectStore(long long transaction_id,
                                  long long object_store_id,
-                                 const WebKit::WebString& name,
+                                 const string16& name,
                                  const IndexedDBKeyPath& key_path,
                                  bool auto_increment);
   virtual void deleteObjectStore(long long object_store_id,
@@ -45,7 +41,7 @@ class CONTENT_EXPORT WebIDBDatabaseImpl {
   virtual void close();
   virtual void abort(long long transaction_id);
   virtual void abort(long long transaction_id,
-                     const WebKit::WebIDBDatabaseError& error);
+                     const IndexedDBDatabaseError& error);
   virtual void commit(long long transaction_id);
 
   virtual void get(long long transaction_id,
@@ -94,7 +90,7 @@ class CONTENT_EXPORT WebIDBDatabaseImpl {
   virtual void createIndex(long long transaction_id,
                            long long object_store_id,
                            long long index_id,
-                           const WebKit::WebString& name,
+                           const string16& name,
                            const IndexedDBKeyPath& key_path,
                            bool unique,
                            bool multi_entry);
diff --git a/content/browser/indexed_db/webidbfactory_impl.cc b/content/browser/indexed_db/webidbfactory_impl.cc
index faa1d57..e86dc11 100644
--- a/content/browser/indexed_db/webidbfactory_impl.cc
+++ b/content/browser/indexed_db/webidbfactory_impl.cc
@@ -7,11 +7,9 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
+#include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
-
-using WebKit::WebString;
 
 namespace content {
 
@@ -21,21 +19,21 @@ WebIDBFactoryImpl::WebIDBFactoryImpl()
 WebIDBFactoryImpl::~WebIDBFactoryImpl() {}
 
 void WebIDBFactoryImpl::getDatabaseNames(IndexedDBCallbacksBase* callbacks,
-                                         const WebString& database_identifier,
-                                         const WebString& data_dir) {
+                                         const string16& database_identifier,
+                                         const string16& data_dir) {
   idb_factory_backend_->GetDatabaseNames(
       IndexedDBCallbacksWrapper::Create(callbacks),
       database_identifier,
       base::FilePath::FromUTF16Unsafe(data_dir));
 }
 
-void WebIDBFactoryImpl::open(const WebString& name,
+void WebIDBFactoryImpl::open(const string16& name,
                              long long version,
                              long long transaction_id,
                              IndexedDBCallbacksBase* callbacks,
                              IndexedDBDatabaseCallbacks* database_callbacks,
-                             const WebString& database_identifier,
-                             const WebString& data_dir) {
+                             const string16& database_identifier,
+                             const string16& data_dir) {
   scoped_refptr<IndexedDBCallbacksWrapper> callbacks_proxy =
       IndexedDBCallbacksWrapper::Create(callbacks);
   scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks_proxy =
@@ -51,10 +49,10 @@ void WebIDBFactoryImpl::open(const WebString& name,
                              base::FilePath::FromUTF16Unsafe(data_dir));
 }
 
-void WebIDBFactoryImpl::deleteDatabase(const WebString& name,
+void WebIDBFactoryImpl::deleteDatabase(const string16& name,
                                        IndexedDBCallbacksBase* callbacks,
-                                       const WebString& database_identifier,
-                                       const WebString& data_dir) {
+                                       const string16& database_identifier,
+                                       const string16& data_dir) {
   idb_factory_backend_->DeleteDatabase(
       name,
       IndexedDBCallbacksWrapper::Create(callbacks),
diff --git a/content/browser/indexed_db/webidbfactory_impl.h b/content/browser/indexed_db/webidbfactory_impl.h
index a2340b7..6afe380 100644
--- a/content/browser/indexed_db/webidbfactory_impl.h
+++ b/content/browser/indexed_db/webidbfactory_impl.h
@@ -6,10 +6,7 @@
 #define CONTENT_BROWSER_INDEXED_DB_WEBIDBFACTORY_IMPL_H_
 
 #include "base/memory/ref_counted.h"
-
-namespace WebKit {
-class WebString;
-}
+#include "base/strings/string16.h"
 
 namespace content {
 
@@ -23,19 +20,19 @@ class WebIDBFactoryImpl {
   virtual ~WebIDBFactoryImpl();
 
   virtual void getDatabaseNames(IndexedDBCallbacksBase* callbacks,
-                                const WebKit::WebString& database_identifier,
-                                const WebKit::WebString& data_dir);
-  virtual void open(const WebKit::WebString& name,
+                                const string16& database_identifier,
+                                const string16& data_dir);
+  virtual void open(const string16& name,
                     long long version,
                     long long transaction_id,
                     IndexedDBCallbacksBase* callbacks,
                     IndexedDBDatabaseCallbacks* database_callbacks,
-                    const WebKit::WebString& database_identifier,
-                    const WebKit::WebString& data_dir);
-  virtual void deleteDatabase(const WebKit::WebString& name,
+                    const string16& database_identifier,
+                    const string16& data_dir);
+  virtual void deleteDatabase(const string16& name,
                               IndexedDBCallbacksBase* callbacks,
-                              const WebKit::WebString& database_identifier,
-                              const WebKit::WebString& data_dir);
+                              const string16& database_identifier,
+                              const string16& data_dir);
 
  private:
   scoped_refptr<IndexedDBFactory> idb_factory_backend_;
diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
index edd64cf..b6e57ea 100644
--- a/content/child/indexed_db/indexed_db_dispatcher.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher.cc
@@ -643,7 +643,10 @@ void IndexedDBDispatcher::OnError(int32 ipc_thread_id,
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id);
   if (!callbacks)
     return;
-  callbacks->onError(WebIDBDatabaseError(code, message));
+  if (message.empty())
+    callbacks->onError(WebIDBDatabaseError(code));
+  else
+    callbacks->onError(WebIDBDatabaseError(code, message));
   pending_callbacks_.Remove(ipc_callbacks_id);
 }
 
@@ -657,7 +660,10 @@ void IndexedDBDispatcher::OnAbort(int32 ipc_thread_id,
       pending_database_callbacks_.Lookup(ipc_database_callbacks_id);
   if (!callbacks)
     return;
-  callbacks->onAbort(transaction_id, WebIDBDatabaseError(code, message));
+  if (message.empty())
+    callbacks->onAbort(transaction_id, WebIDBDatabaseError(code));
+  else
+    callbacks->onAbort(transaction_id, WebIDBDatabaseError(code, message));
 }
 
 void IndexedDBDispatcher::OnComplete(int32 ipc_thread_id,
diff --git a/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
index cb07345..5c0e586 100644
--- a/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
@@ -16,7 +16,6 @@
 using WebKit::WebData;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBDatabase;
-using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBKey;
 
 namespace content {