| Index: content/browser/indexed_db/indexed_db_callbacks.cc
|
| diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc
|
| index 2580fc0db3fbab2ae50d63001a135dce7f9d1670..1525eeb65912d8229937886741fb7210f9fcbcdc 100644
|
| --- a/content/browser/indexed_db/indexed_db_callbacks.cc
|
| +++ b/content/browser/indexed_db/indexed_db_callbacks.cc
|
| @@ -67,7 +67,7 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
|
| IndexedDBCallbacks::~IndexedDBCallbacks() {}
|
|
|
| void IndexedDBCallbacks::OnError(const IndexedDBDatabaseError& error) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| dispatcher_host_->Send(new IndexedDBMsg_CallbacksError(
|
| ipc_thread_id_, ipc_callbacks_id_, error.code(), error.message()));
|
| @@ -75,7 +75,7 @@ void IndexedDBCallbacks::OnError(const IndexedDBDatabaseError& error) {
|
| }
|
|
|
| void IndexedDBCallbacks::OnSuccess(const std::vector<string16>& value) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -92,7 +92,7 @@ void IndexedDBCallbacks::OnSuccess(const std::vector<string16>& value) {
|
| }
|
|
|
| void IndexedDBCallbacks::OnBlocked(int64 existing_version) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| // No transaction/db callbacks for DeleteDatabase.
|
| @@ -109,7 +109,7 @@ void IndexedDBCallbacks::OnUpgradeNeeded(
|
| scoped_ptr<IndexedDBConnection> connection,
|
| const IndexedDBDatabaseMetadata& metadata,
|
| WebIDBCallbacks::DataLoss data_loss) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_NE(kNoTransaction, host_transaction_id_);
|
| @@ -133,7 +133,7 @@ void IndexedDBCallbacks::OnUpgradeNeeded(
|
|
|
| void IndexedDBCallbacks::OnSuccess(scoped_ptr<IndexedDBConnection> connection,
|
| const IndexedDBDatabaseMetadata& metadata) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_NE(kNoTransaction, host_transaction_id_);
|
| @@ -161,14 +161,14 @@ void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
|
| const IndexedDBKey& key,
|
| const IndexedDBKey& primary_key,
|
| std::vector<char>* value) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| DCHECK_EQ(kNoDatabase, ipc_database_id_);
|
| DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
|
|
|
| - int32 ipc_object_id = dispatcher_host_->Add(cursor);
|
| + int32 ipc_object_id = dispatcher_host_->Add(cursor.get());
|
| IndexedDBMsg_CallbacksSuccessIDBCursor_Params params;
|
| params.ipc_thread_id = ipc_thread_id_;
|
| params.ipc_callbacks_id = ipc_callbacks_id_;
|
| @@ -187,7 +187,7 @@ void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
|
| void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& key,
|
| const IndexedDBKey& primary_key,
|
| std::vector<char>* value) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_NE(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -222,7 +222,7 @@ void IndexedDBCallbacks::OnSuccessWithPrefetch(
|
| DCHECK_EQ(keys.size(), primary_keys.size());
|
| DCHECK_EQ(keys.size(), values.size());
|
|
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_NE(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -252,7 +252,7 @@ void IndexedDBCallbacks::OnSuccessWithPrefetch(
|
| void IndexedDBCallbacks::OnSuccess(std::vector<char>* value,
|
| const IndexedDBKey& key,
|
| const IndexedDBKeyPath& key_path) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -273,7 +273,7 @@ void IndexedDBCallbacks::OnSuccess(std::vector<char>* value,
|
| }
|
|
|
| void IndexedDBCallbacks::OnSuccess(std::vector<char>* value) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK(kNoCursor == ipc_cursor_id_ || value == NULL);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -292,7 +292,7 @@ void IndexedDBCallbacks::OnSuccess(std::vector<char>* value) {
|
| }
|
|
|
| void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& value) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -305,7 +305,7 @@ void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& value) {
|
| }
|
|
|
| void IndexedDBCallbacks::OnSuccess(int64 value) {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
| @@ -318,7 +318,7 @@ void IndexedDBCallbacks::OnSuccess(int64 value) {
|
| }
|
|
|
| void IndexedDBCallbacks::OnSuccess() {
|
| - DCHECK(dispatcher_host_);
|
| + DCHECK(dispatcher_host_.get());
|
|
|
| DCHECK_EQ(kNoCursor, ipc_cursor_id_);
|
| DCHECK_EQ(kNoTransaction, host_transaction_id_);
|
|
|