Convert WebIDBDatabaseImpl to IndexedDBConnection

content/browser/indexed_db/indexed_db_callbacks.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.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_key.h"
 #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
     : public base::RefCounted<IndexedDBCallbacks> {
  public:
   // Simple payload responses
   static scoped_refptr<IndexedDBCallbacks> Create(
       IndexedDBDispatcherHost* dispatcher_host,
       int32 ipc_thread_id,
       int32 ipc_callbacks_id) {
@@ skipping 30 matching lines @@
 
   // IndexedDBFactory::GetDatabaseNames
   virtual void OnSuccess(const std::vector<string16>& string);
 
   // IndexedDBFactory::Open / DeleteDatabase
   virtual void OnBlocked(int64 existing_version);
 
   // 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,
                          const IndexedDBKey& key,
                          const IndexedDBKey& primary_key,
                          std::vector<char>* value);
 
   // IndexedDBCursor::Continue / Advance
   virtual void OnSuccess(const IndexedDBKey& key,
                          const IndexedDBKey& primary_key,
@@ skipping 41 matching lines @@
   IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
                      int32 ipc_thread_id,
                      int32 ipc_callbacks_id,
                      int32 ipc_database_callbacks_id,
                      int64 host_transaction_id,
                      const GURL& origin_url);
 
  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_;
   int32 ipc_thread_id_;
 
   // IndexedDBCursor callbacks ------------------------
   int32 ipc_cursor_id_;
 
   // IndexedDBDatabase callbacks ------------------------
   int64 host_transaction_id_;
   GURL origin_url_;
   int32 ipc_database_id_;
   int32 ipc_database_callbacks_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_