Change AndroidHistoryProviderService to use CancelableTaskTracker (4/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 70 matching lines @@
   if (hs) {
     hs->Schedule(HistoryService::PRIORITY_NORMAL,
             &HistoryBackend::DeleteHistoryAndBookmarks, NULL, request,
             selection, selection_args);
   } else {
     request->ForwardResultAsync(request->handle(), false, 0);
   }
   return request->handle();
 }
 
-AndroidHistoryProviderService::Handle
+base::CancelableTaskTracker::TaskId
 AndroidHistoryProviderService::InsertHistoryAndBookmark(
     const history::HistoryAndBookmarkRow& values,
-    CancelableRequestConsumerBase* consumer,
-    const InsertCallback& callback) {
-  InsertRequest* request = new InsertRequest(callback);
-  AddRequest(request, consumer);
+    const InsertCallback& callback,
+    base::CancelableTaskTracker* tracker) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs) {
-    hs->Schedule(HistoryService::PRIORITY_NORMAL,
-            &HistoryBackend::InsertHistoryAndBookmark, NULL, request, values);
+    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::InsertHistoryAndBookmark,
+                   hs->history_backend_.get(),
+                   values),
+        callback);
   } else {
-    request->ForwardResultAsync(request->handle(), false, 0);
+    callback.Run(0);
+    return base::CancelableTaskTracker::kBadTaskId;
   }
-  return request->handle();
 }
 
 AndroidHistoryProviderService::Handle
 AndroidHistoryProviderService::DeleteHistory(
     const std::string& selection,
     const std::vector<base::string16>& selection_args,
     CancelableRequestConsumerBase* consumer,
     const DeleteCallback& callback) {
   DeleteRequest* request = new DeleteRequest(callback);
   AddRequest(request, consumer);
@@ skipping 41 matching lines @@
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs) {
     hs->ScheduleAndForget(HistoryService::PRIORITY_NORMAL,
             &HistoryBackend::CloseStatement, statement);
   } else {
     delete statement;
   }
 }
 
+base::CancelableTaskTracker::TaskId
+AndroidHistoryProviderService::InsertSearchTerm(
+    const history::SearchRow& row,
+    const InsertCallback& callback,
+    base::CancelableTaskTracker* tracker) {
+  HistoryService* hs =
+      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  if (hs) {
+    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::InsertSearchTerm, hs->history_backend_.get(), row),
+        callback);
+  } else {
+    callback.Run(0);
+    return base::CancelableTaskTracker::kBadTaskId;
+  }
+}
+
 AndroidHistoryProviderService::Handle
-AndroidHistoryProviderService::InsertSearchTerm(
-    const history::SearchRow& row,
-    CancelableRequestConsumerBase* consumer,
-    const InsertCallback& callback) {
-  InsertRequest* request = new InsertRequest(callback);
-  AddRequest(request, consumer);
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs) {
-    hs->Schedule(HistoryService::PRIORITY_NORMAL,
-            &HistoryBackend::InsertSearchTerm, NULL, request, row);
-  } else {
-    request->ForwardResultAsync(request->handle(), false, 0);
-  }
-  return request->handle();
-}
-
-AndroidHistoryProviderService::Handle
 AndroidHistoryProviderService::UpdateSearchTerms(
     const history::SearchRow& row,
     const std::string& selection,
     const std::vector<base::string16>& selection_args,
     CancelableRequestConsumerBase* consumer,
     const UpdateCallback& callback) {
   UpdateRequest* request = new UpdateRequest(callback);
   AddRequest(request, consumer);
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
@@ skipping 48 matching lines @@
                    projections,
                    selection,
                    selection_args,
                    sort_order),
         callback);
   } else {
     callback.Run(NULL);
     return base::CancelableTaskTracker::kBadTaskId;
   }
 }