Remove content/browser dependency on WebKit::WebIDBCallbacks and WebKit::WebIDBDatabaseCallbacks

Remove content/browser dependency on many WebKit::WebIDB* classes

BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=205132

[alecflett, 2013-06-06 17:36:10]

I haven't yet renamed these from WebIDBFooImpl, because I'd like to do that in a
separate pass.

[jsbell, 2013-06-06 18:25:25]

lgtm with nit/suggestion/question

Now that they do not implement WebKit::WebXXX interfaces, We'll need to make the
Web{Factory,Database,Cursor}Impl classes conform to Chromium coding conventions.
Or delete them (merge with what they're wrapping).

https://codereview.chromium.org/16573003/diff/1/content/browser/in_process_we...
File content/browser/in_process_webkit/indexed_db_callbacks.h (right):

https://codereview.chromium.org/16573003/diff/1/content/browser/in_process_we...
content/browser/in_process_webkit/indexed_db_callbacks.h:29: // implemented by
subclasses, but need to be called later
Capitalize and punctuate.

https://codereview.chromium.org/16573003/diff/4001/content/browser/in_process...
File content/browser/in_process_webkit/indexed_db_callbacks.cc (right):

https://codereview.chromium.org/16573003/diff/4001/content/browser/in_process...
content/browser/in_process_webkit/indexed_db_callbacks.cc:40: const
WebKit::WebVector<WebKit::WebString>& value) {
Just to make this class less chatty, recommend "using" declaration of
WebKit::WebString, WebVector and WebData

https://codereview.chromium.org/16573003/diff/4001/content/browser/indexed_db...
File content/browser/indexed_db/indexed_db_callbacks_wrapper.h (right):

https://codereview.chromium.org/16573003/diff/4001/content/browser/indexed_db...
content/browser/indexed_db/indexed_db_callbacks_wrapper.h:76: const
content::IndexedDBDatabaseMetadata& metadata);
Why is this namespace prefix needed?

[alecflett, 2013-06-06 19:02:47]

https://codereview.chromium.org/16573003/diff/4001/content/browser/in_process...
File content/browser/in_process_webkit/indexed_db_callbacks.cc (right):

https://codereview.chromium.org/16573003/diff/4001/content/browser/in_process...
content/browser/in_process_webkit/indexed_db_callbacks.cc:40: const
WebKit::WebVector<WebKit::WebString>& value) {
On 2013/06/06 18:25:25, jsbell wrote:
> Just to make this class less chatty, recommend "using" declaration of
> WebKit::WebString, WebVector and WebData

Done.

https://codereview.chromium.org/16573003/diff/4001/content/browser/indexed_db...
File content/browser/indexed_db/indexed_db_callbacks_wrapper.h (right):

https://codereview.chromium.org/16573003/diff/4001/content/browser/indexed_db...
content/browser/indexed_db/indexed_db_callbacks_wrapper.h:76: const
content::IndexedDBDatabaseMetadata& metadata);
On 2013/06/06 18:25:25, jsbell wrote:
> Why is this namespace prefix needed?

Because this now includes the IPC message of the same name, which leads to an
ambiguity that gives some pretty odd error messages from the compiler about
signatures not matching

[commit-bot: I haz the power, 2013-06-06 19:09:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/10001

[commit-bot: I haz the power, 2013-06-06 19:09:33]

Failed to apply patch for content/browser/indexed_db/webidbfactory_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/indexed_db/webidbfactory_impl.cc
  Hunk #1 FAILED at 8.
  Hunk #2 succeeded at 24 (offset 1 line).
  Hunk #3 succeeded at 36 (offset 1 line).
  Hunk #4 succeeded at 56 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file
content/browser/indexed_db/webidbfactory_impl.cc.rej

Patch:       content/browser/indexed_db/webidbfactory_impl.cc
Index: content/browser/indexed_db/webidbfactory_impl.cc
diff --git a/content/browser/indexed_db/webidbfactory_impl.cc
b/content/browser/indexed_db/webidbfactory_impl.cc
index
1fc78fac6e89cf3fb768c7bdb5520eba91781da4..65fcead30ecb7346f6967dae13337bdce614a10a
100644
--- a/content/browser/indexed_db/webidbfactory_impl.cc
+++ b/content/browser/indexed_db/webidbfactory_impl.cc
@@ -8,12 +8,8 @@
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_factory_impl.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
 
-using WebKit::WebIDBCallbacks;
-using WebKit::WebIDBDatabaseCallbacks;
-using WebKit::WebIDBFactory;
 using WebKit::WebString;
 
 namespace content {
@@ -23,7 +19,7 @@ WebIDBFactoryImpl::WebIDBFactoryImpl()
 
 WebIDBFactoryImpl::~WebIDBFactoryImpl() {}
 
-void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks* callbacks,
+void WebIDBFactoryImpl::getDatabaseNames(IndexedDBCallbacksBase* callbacks,
                                          const WebString& database_identifier,
                                          const WebString& data_dir) {
   idb_factory_backend_->GetDatabaseNames(
@@ -35,8 +31,8 @@ void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks*
callbacks,
 void WebIDBFactoryImpl::open(const WebString& name,
                              long long version,
                              long long transaction_id,
-                             WebIDBCallbacks* callbacks,
-                             WebIDBDatabaseCallbacks* database_callbacks,
+                             IndexedDBCallbacksBase* callbacks,
+                             IndexedDBDatabaseCallbacks* database_callbacks,
                              const WebString& database_identifier,
                              const WebString& data_dir) {
   scoped_refptr<IndexedDBCallbacksWrapper> callbacks_proxy =
@@ -55,7 +51,7 @@ void WebIDBFactoryImpl::open(const WebString& name,
 }
 
 void WebIDBFactoryImpl::deleteDatabase(const WebString& name,
-                                       WebIDBCallbacks* callbacks,
+                                       IndexedDBCallbacksBase* callbacks,
                                        const WebString& database_identifier,
                                        const WebString& data_dir) {
   idb_factory_backend_->DeleteDatabase(

[jsbell, 2013-06-06 19:09:42]

On 2013/06/06 19:02:47, alecflett wrote:
> Because this now includes the IPC message of the same name, which leads to an
> ambiguity that gives some pretty odd error messages from the compiler about
> signatures not matching

Ah, forgot about the IPC name.

I think we can eliminate that message now anyway. :)

[commit-bot: I haz the power, 2013-06-06 19:51:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/10001

[commit-bot: I haz the power, 2013-06-06 19:51:45]

Failed to apply patch for content/browser/indexed_db/webidbfactory_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/indexed_db/webidbfactory_impl.cc
  Hunk #1 FAILED at 8.
  Hunk #2 succeeded at 24 (offset 1 line).
  Hunk #3 succeeded at 36 (offset 1 line).
  Hunk #4 succeeded at 56 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file
content/browser/indexed_db/webidbfactory_impl.cc.rej

Patch:       content/browser/indexed_db/webidbfactory_impl.cc
Index: content/browser/indexed_db/webidbfactory_impl.cc
diff --git a/content/browser/indexed_db/webidbfactory_impl.cc
b/content/browser/indexed_db/webidbfactory_impl.cc
index
1fc78fac6e89cf3fb768c7bdb5520eba91781da4..65fcead30ecb7346f6967dae13337bdce614a10a
100644
--- a/content/browser/indexed_db/webidbfactory_impl.cc
+++ b/content/browser/indexed_db/webidbfactory_impl.cc
@@ -8,12 +8,8 @@
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_factory_impl.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
 
-using WebKit::WebIDBCallbacks;
-using WebKit::WebIDBDatabaseCallbacks;
-using WebKit::WebIDBFactory;
 using WebKit::WebString;
 
 namespace content {
@@ -23,7 +19,7 @@ WebIDBFactoryImpl::WebIDBFactoryImpl()
 
 WebIDBFactoryImpl::~WebIDBFactoryImpl() {}
 
-void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks* callbacks,
+void WebIDBFactoryImpl::getDatabaseNames(IndexedDBCallbacksBase* callbacks,
                                          const WebString& database_identifier,
                                          const WebString& data_dir) {
   idb_factory_backend_->GetDatabaseNames(
@@ -35,8 +31,8 @@ void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks*
callbacks,
 void WebIDBFactoryImpl::open(const WebString& name,
                              long long version,
                              long long transaction_id,
-                             WebIDBCallbacks* callbacks,
-                             WebIDBDatabaseCallbacks* database_callbacks,
+                             IndexedDBCallbacksBase* callbacks,
+                             IndexedDBDatabaseCallbacks* database_callbacks,
                              const WebString& database_identifier,
                              const WebString& data_dir) {
   scoped_refptr<IndexedDBCallbacksWrapper> callbacks_proxy =
@@ -55,7 +51,7 @@ void WebIDBFactoryImpl::open(const WebString& name,
 }
 
 void WebIDBFactoryImpl::deleteDatabase(const WebString& name,
-                                       WebIDBCallbacks* callbacks,
+                                       IndexedDBCallbacksBase* callbacks,
                                        const WebString& database_identifier,
                                        const WebString& data_dir) {
   idb_factory_backend_->DeleteDatabase(

[commit-bot: I haz the power, 2013-06-06 21:35:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/16001

[commit-bot: I haz the power, 2013-06-07 01:40:06]

Retried try job too often on win_rel for step(s) sync_integration_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-06-07 03:08:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/16001

[commit-bot: I haz the power, 2013-06-07 05:06:04]

Retried try job too often on win_rel for step(s) nacl_integration
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-06-07 05:35:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/16001

[commit-bot: I haz the power, 2013-06-07 09:16:07]

Failed to apply patch for
content/browser/indexed_db/indexed_db_database_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/indexed_db/indexed_db_database_unittest.cc
  Hunk #1 succeeded at 6 with fuzz 2 (offset 2 lines).
  Hunk #2 FAILED at 21.
  1 out of 4 hunks FAILED -- saving rejects to file
content/browser/indexed_db/indexed_db_database_unittest.cc.rej

Patch:       content/browser/indexed_db/indexed_db_database_unittest.cc
Index: content/browser/indexed_db/indexed_db_database_unittest.cc
diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc
b/content/browser/indexed_db/indexed_db_database_unittest.cc
index
e72b89130497a26847e8a5a5e6a28af6386b27c8..6caeee125089c0b71c1dfec2b42ead37fdad6587
100644
--- a/content/browser/indexed_db/indexed_db_database_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_database_unittest.cc
@@ -4,10 +4,13 @@
 
 #include "content/browser/indexed_db/indexed_db_database.h"
 
+#include <gtest/gtest.h>
+
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/browser/in_process_webkit/indexed_db_database_callbacks.h"
 #include "content/browser/indexed_db/indexed_db.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
@@ -18,11 +21,7 @@
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
 
-#include <gtest/gtest.h>
-
-using WebKit::WebIDBDatabase;
 using WebKit::WebIDBDatabaseError;
-using WebKit::WebIDBDatabaseCallbacks;
 
 namespace content {
 
@@ -163,29 +162,6 @@ class MockIDBDatabaseCallbacks : public
IndexedDBDatabaseCallbacksWrapper {
   bool was_abort_called_;
 };
 
-class WebIDBDatabaseCallbacksImpl : public WebIDBDatabaseCallbacks {
- public:
-  explicit WebIDBDatabaseCallbacksImpl(
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks)
-      : callbacks_(callbacks) {}
-  virtual ~WebIDBDatabaseCallbacksImpl() {}
-
-  virtual void onForcedClose() { callbacks_->OnForcedClose(); }
-  virtual void onVersionChange(long long old_version, long long new_version) {
-    callbacks_->OnVersionChange(old_version, new_version);
-  }
-  virtual void onAbort(long long transaction_id,
-                       const WebIDBDatabaseError& error) {
-    callbacks_->OnAbort(transaction_id, IndexedDBDatabaseError(error));
-  }
-  virtual void onComplete(long long transaction_id) {
-    callbacks_->OnComplete(transaction_id);
-  }
-
- private:
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks_;
-};
-
 TEST(IndexedDBDatabaseTest, ForcedClose) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
@@ -202,15 +178,12 @@ TEST(IndexedDBDatabaseTest, ForcedClose) {
 
   scoped_refptr<MockIDBDatabaseCallbacks> connection =
       MockIDBDatabaseCallbacks::Create();
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> connection_proxy =
-      IndexedDBDatabaseCallbacksWrapper::Create(
-          new WebIDBDatabaseCallbacksImpl(connection));
-  WebIDBDatabaseImpl web_database(backend, connection_proxy);
+  WebIDBDatabaseImpl web_database(backend, connection);
 
   scoped_refptr<MockIDBCallbacks> request = MockIDBCallbacks::Create();
   const int64 upgrade_transaction_id = 3;
   backend->OpenConnection(request,
-                          connection_proxy,
+                          connection,
                           upgrade_transaction_id,
                           IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);

[commit-bot: I haz the power, 2013-06-07 12:52:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/41001

[commit-bot: I haz the power, 2013-06-07 16:59:06]

Retried try job too often on win_rel for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-06-07 17:53:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/41001

[commit-bot: I haz the power, 2013-06-07 17:54:03]

Failed to apply patch for
content/browser/indexed_db/indexed_db_callbacks_wrapper.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/indexed_db/indexed_db_callbacks_wrapper.h
  Hunk #1 FAILED at 16.
  Hunk #2 succeeded at 74 (offset 2 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
content/browser/indexed_db/indexed_db_callbacks_wrapper.h.rej

Patch:       content/browser/indexed_db/indexed_db_callbacks_wrapper.h
Index: content/browser/indexed_db/indexed_db_callbacks_wrapper.h
diff --git a/content/browser/indexed_db/indexed_db_callbacks_wrapper.h
b/content/browser/indexed_db/indexed_db_callbacks_wrapper.h
index
ca5ae44fa3f1c835147966cfc96c788a91e5b11a..bffa8917ae6766ac71edc0293bc30c5a7e5a0c60
100644
--- a/content/browser/indexed_db/indexed_db_callbacks_wrapper.h
+++ b/content/browser/indexed_db/indexed_db_callbacks_wrapper.h
@@ -16,21 +16,19 @@
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
-#include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
-
-namespace WebKit {
-class WebIDBCallbacks;
-}
 
 namespace content {
 class IndexedDBCursor;
+class IndexedDBCallbacksBase;
 class WebIDBDatabaseImpl;
+class WebIDBCursorImpl;
+struct IndexedDBDatabaseMetadata;
 
 class CONTENT_EXPORT IndexedDBCallbacksWrapper
     : public base::RefCounted<IndexedDBCallbacksWrapper> {
  public:
   static scoped_refptr<IndexedDBCallbacksWrapper> Create(
-      WebKit::WebIDBCallbacks* callbacks) {
+      IndexedDBCallbacksBase* callbacks) {
     return make_scoped_refptr(new IndexedDBCallbacksWrapper(callbacks));
   }
 
@@ -72,22 +70,23 @@ class CONTENT_EXPORT IndexedDBCallbacksWrapper
   // From IDBFactory.open()/deleteDatabase()
   virtual void OnBlocked(int64 existing_version);
   // From IDBFactory.open()
-  virtual void OnUpgradeNeeded(int64 old_version,
-                               scoped_refptr<IndexedDBDatabase> db,
-                               const IndexedDBDatabaseMetadata& metadata);
+  virtual void OnUpgradeNeeded(
+      int64 old_version,
+      scoped_refptr<IndexedDBDatabase> db,
+      const content::IndexedDBDatabaseMetadata& metadata);
   virtual void OnSuccess(scoped_refptr<IndexedDBDatabase> db,
-                         const IndexedDBDatabaseMetadata& metadata);
+                         const content::IndexedDBDatabaseMetadata& metadata);
   virtual void SetDatabaseCallbacks(
       scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks);
 
  protected:
   virtual ~IndexedDBCallbacksWrapper();
-  explicit IndexedDBCallbacksWrapper(WebKit::WebIDBCallbacks* callbacks);
+  explicit IndexedDBCallbacksWrapper(IndexedDBCallbacksBase* callbacks);
 
  private:
   friend class base::RefCounted<IndexedDBCallbacksWrapper>;
   scoped_ptr<WebIDBDatabaseImpl> web_database_impl_;
-  scoped_ptr<WebKit::WebIDBCallbacks> callbacks_;
+  scoped_ptr<IndexedDBCallbacksBase> callbacks_;
   scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks_;
   bool did_complete_;
   bool did_create_proxy_;

[commit-bot: I haz the power, 2013-06-08 22:31:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/66001

[commit-bot: I haz the power, 2013-06-08 22:52:19]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-09 18:53:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/alecflett@chromium.org/16573003/83001

[commit-bot: I haz the power, 2013-06-10 02:30:50]

Change committed as 205132