IndexedDB: Simplify cursor data callbacks.

content/common/indexed_db/indexed_db_dispatcher.cc

 // 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.
 
 #include "content/common/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
@@ skipping 617 matching lines @@
   const IndexedDBKey& primary_key = p.primary_key;
   const SerializedScriptValue& value = p.serialized_value;
 
   WebIDBCallbacks* callbacks =
       pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
 
   RendererWebIDBCursorImpl* cursor = new RendererWebIDBCursorImpl(object_id);
   cursors_[object_id] = cursor;
-  // TODO(jsbell): Remove the next two calls after WK92278 rolls.
-  cursor->SetKeyAndValue(key, primary_key, value);
-  callbacks->onSuccess(cursor);
   callbacks->onSuccess(cursor, key, primary_key, value);
 
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessCursorContinue(
     const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p) {
   DCHECK_EQ(p.thread_id, CurrentWorkerId());
   int32 response_id = p.response_id;
   int32 cursor_id = p.cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
   const SerializedScriptValue& value = p.serialized_value;
 
   RendererWebIDBCursorImpl* cursor = cursors_[cursor_id];
   DCHECK(cursor);
-  // TODO(jsbell): Remove the next call after WK92278·rolls.
-  cursor->SetKeyAndValue(key, primary_key, value);
 
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   if (!callbacks)
     return;
 
-  // TODO(jsbell): Remove the ...WithContinuation call after WK92278 rolls.
-  callbacks->onSuccessWithContinuation();
   callbacks->onSuccess(key, primary_key, value);
 
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessCursorPrefetch(
     const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p) {
   DCHECK_EQ(p.thread_id, CurrentWorkerId());
   int32 response_id = p.response_id;
   int32 cursor_id = p.cursor_id;
@@ skipping 99 matching lines @@
 }
 
 void IndexedDBDispatcher::ResetCursorPrefetchCaches(int32 exception_cursor_id) {
   typedef std::map<int32, RendererWebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }