Change AndroidHistoryProviderService to use CancelableTaskTracker (2/6)

chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h"
 
 #include <cmath>
 #include <list>
 #include <utility>
 
@@ skipping 763 matching lines @@
       : HistoryProviderTask(service, cancelable_consumer, cancelable_tracker),
         result_(NULL) {}
 
   history::AndroidStatement* Run(
       const std::vector<history::HistoryAndBookmarkRow::ColumnID>& projections,
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
       const std::string& sort_order) {
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&AndroidHistoryProviderService::QueryHistoryAndBookmarks,
-                   base::Unretained(service()), projections, selection,
-                   selection_args, sort_order, cancelable_consumer(),
+                   base::Unretained(service()),
+                   projections,
+                   selection,
+                   selection_args,
+                   sort_order,
                    base::Bind(&QueryBookmarksFromAPITask::OnBookmarksQueried,
-                              base::Unretained(this))));
+                              base::Unretained(this)),
+                   cancelable_tracker()));
     return result_;
   }
 
  private:
-  void OnBookmarksQueried(AndroidHistoryProviderService::Handle handle,
-                          bool succeeded,
-                          history::AndroidStatement* statement) {
+  void OnBookmarksQueried(history::AndroidStatement* statement) {
     result_ = statement;
     RequestCompleted();
   }
 
   history::AndroidStatement* result_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryBookmarksFromAPITask);
 };
 
 // Updates bookmarks from the API.
@@ skipping 190 matching lines @@
                        cancelable_consumer,
                        cancelable_tracker,
                        profile),
         result_(NULL) {}
 
   history::AndroidStatement* Run(
       const std::vector<history::SearchRow::ColumnID>& projections,
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
       const std::string& sort_order) {
-    RunAsyncRequestOnUIThreadBlocking(
-        base::Bind(&AndroidHistoryProviderService::QuerySearchTerms,
-                   base::Unretained(service()), projections, selection,
-                   selection_args, sort_order, cancelable_consumer(),
-                   base::Bind(
-                      &QuerySearchTermsFromAPITask::OnSearchTermsQueried,
-                      base::Unretained(this))));
+    RunAsyncRequestOnUIThreadBlocking(base::Bind(
+        &AndroidHistoryProviderService::QuerySearchTerms,
+        base::Unretained(service()),
+        projections,
+        selection,
+        selection_args,
+        sort_order,
+        base::Bind(&QuerySearchTermsFromAPITask::OnSearchTermsQueried,
+                   base::Unretained(this)),
+        cancelable_tracker()));
     return result_;
   }
 
  private:
   // Callback to return the result.
-  void OnSearchTermsQueried(AndroidHistoryProviderService::Handle handle,
-                            bool succeeded,
-                            history::AndroidStatement* statement) {
+  void OnSearchTermsQueried(history::AndroidStatement* statement) {
     result_ = statement;
     RequestCompleted();
   }
 
   history::AndroidStatement* result_;
 
   DISALLOW_COPY_AND_ASSIGN(QuerySearchTermsFromAPITask);
 };
 
 // Updates search terms from the API.
@@ skipping 646 matching lines @@
     Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj());
   } else if (type ==
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   }
 }