Change AndroidHistoryProviderService to use CancelableTaskTracker (3/6)

chrome/browser/history/android/sqlite_cursor.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 "chrome/browser/history/android/sqlite_cursor.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 149 matching lines @@
       test_observer_(NULL) {
 }
 
 SQLiteCursor::~SQLiteCursor() {
 }
 
 void SQLiteCursor::DestroyOnUIThread() {
   // Consumer requests were set in the UI thread. They must be cancelled
   // using the same thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  consumer_.reset();
   tracker_.reset();
   service_->CloseStatement(statement_);
   delete this;
 }
 
 bool SQLiteCursor::GetFavicon(favicon_base::FaviconID id,
                               std::vector<unsigned char>* image_data) {
   if (id) {
     BrowserThread::PostTask(
         BrowserThread::UI,
@@ skipping 30 matching lines @@
 }
 
 void SQLiteCursor::OnFaviconData(
     const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   favicon_bitmap_result_ = bitmap_result;
   event_.Signal();
   if (test_observer_)
     test_observer_->OnGetFaviconResult();
 }
 
-void SQLiteCursor::OnMoved(AndroidHistoryProviderService::Handle handle,
-                           int pos) {
+void SQLiteCursor::OnMoved(int pos) {
   position_ = pos;
   event_.Signal();
   if (test_observer_)
     // Notified test_observer on UI thread instead of the one it will wait.
     test_observer_->OnGetMoveToResult();
 }
 
 SQLiteCursor::JavaColumnType SQLiteCursor::GetColumnTypeInternal(int column) {
   if (column == statement_->favicon_index())
     return SQLiteCursor::BLOB;
 
   return ToJavaColumnType(statement_->statement()->ColumnType(column));
 }
 
 void SQLiteCursor::RunMoveStatementOnUIThread(int pos) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!consumer_.get())
-    consumer_.reset(new CancelableRequestConsumer());
+  if (!tracker_.get())
+    tracker_.reset(new base::CancelableTaskTracker());
   service_->MoveStatement(
-      statement_, position_, pos, consumer_.get(),
-      base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this)));
+      statement_,
+      position_,
+      pos,
+      base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this)),
+      tracker_.get());
 }