Change AndroidHistoryProviderService to use CancelableTaskTracker (3/6)

chrome/browser/history/android/android_history_provider_service.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/android_history_provider_service.h"
 
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 108 matching lines @@
   if (hs) {
     hs->Schedule(HistoryService::PRIORITY_NORMAL,
             &HistoryBackend::DeleteHistory, NULL, request, selection,
             selection_args);
   } else {
     request->ForwardResultAsync(request->handle(), false, 0);
   }
   return request->handle();
 }
 
-AndroidHistoryProviderService::Handle
+base::CancelableTaskTracker::TaskId
 AndroidHistoryProviderService::MoveStatement(
     history::AndroidStatement* statement,
     int current_pos,
     int destination,
-    CancelableRequestConsumerBase* consumer,
-    const MoveStatementCallback& callback) {
-  MoveStatementRequest* request = new MoveStatementRequest(callback);
-  AddRequest(request, consumer);
+    const MoveStatementCallback& callback,
+    base::CancelableTaskTracker* tracker) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs) {
-    hs->Schedule(HistoryService::PRIORITY_NORMAL,
-            &HistoryBackend::MoveStatement, NULL, request, statement,
-            current_pos, destination);
+    DCHECK(hs->thread_) << "History service being called after cleanup";
+    DCHECK(hs->thread_checker_.CalledOnValidThread());
+    return tracker->PostTaskAndReplyWithResult(
+        hs->thread_->message_loop_proxy().get(),
+        FROM_HERE,
+        base::Bind(&HistoryBackend::MoveStatement,
+                   hs->history_backend_.get(),
+                   statement,
+                   current_pos,
+                   destination),
+        callback);
   } else {
-    request->ForwardResultAsync(request->handle(), current_pos);
+    callback.Run(current_pos);
+    return base::CancelableTaskTracker::kBadTaskId;
   }
-  return request->handle();
 }
 
 void AndroidHistoryProviderService::CloseStatement(
     history::AndroidStatement* statement) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs) {
     hs->ScheduleAndForget(HistoryService::PRIORITY_NORMAL,
             &HistoryBackend::CloseStatement, statement);
   } else {
@@ skipping 81 matching lines @@
                    projections,
                    selection,
                    selection_args,
                    sort_order),
         callback);
   } else {
     callback.Run(NULL);
     return base::CancelableTaskTracker::kBadTaskId;
   }
 }