Convert WebIDBDatabaseImpl to IndexedDBConnection

content/browser/indexed_db/indexed_db_callbacks.h

Index: content/browser/indexed_db/indexed_db_callbacks.h
diff --git a/content/browser/indexed_db/indexed_db_callbacks.h b/content/browser/indexed_db/indexed_db_callbacks.h
index 6ed751c6f83645dc377724eb33edffb6053b665c..b32415966891316c5b44d413f555077ab44c920b 100644
--- a/content/browser/indexed_db/indexed_db_callbacks.h
+++ b/content/browser/indexed_db/indexed_db_callbacks.h
@@ -19,13 +19,12 @@
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
-#include "third_party/WebKit/public/platform/WebIDBDatabase.h"
 
 namespace content {
+class IndexedDBConnection;
 class IndexedDBCursor;
 class IndexedDBDatabase;
 class IndexedDBDatabaseCallbacks;
-class WebIDBDatabaseImpl;
 struct IndexedDBDatabaseMetadata;
 
 class CONTENT_EXPORT IndexedDBCallbacks
@@ -76,13 +75,11 @@ class CONTENT_EXPORT IndexedDBCallbacks
   // IndexedDBFactory::Open
   virtual void OnUpgradeNeeded(
       int64 old_version,
-      scoped_refptr<IndexedDBDatabase> db,
+      scoped_ptr<IndexedDBConnection> connection,
       const content::IndexedDBDatabaseMetadata& metadata,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
-  virtual void OnSuccess(scoped_refptr<IndexedDBDatabase> db,
+  virtual void OnSuccess(scoped_ptr<IndexedDBConnection> connection,
                          const content::IndexedDBDatabaseMetadata& metadata);
-  void SetDatabaseCallbacks(
-      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks);
 
   // IndexedDBDatabase::OpenCursor
   virtual void OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
@@ -144,11 +141,6 @@ class CONTENT_EXPORT IndexedDBCallbacks
  private:
   friend class base::RefCounted<IndexedDBCallbacks>;
 
-  scoped_ptr<WebIDBDatabaseImpl> web_database_impl_;

[jsbell, 2013/07/02 17:38:15]

Unused even before this patch.

-  scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks_;

[jsbell, 2013/07/02 17:38:15]

The db callbacks and connection are now associated during the creation of the
connection, so this storage is not necessary.

-  bool did_complete_;

[jsbell, 2013/07/02 17:38:15]

Unused even before this patch.

-  bool did_create_proxy_;

[jsbell, 2013/07/02 17:38:15]

Redundant with ipc_database_id_

-
   // Originally from IndexedDBCallbacks:
   scoped_refptr<IndexedDBDispatcherHost> dispatcher_host_;
   int32 ipc_callbacks_id_;