Change AndroidHistoryProviderService to use CancelableTaskTracker (6/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 833 matching lines @@
   RemoveBookmarksFromAPITask(AndroidHistoryProviderService* service,
                              CancelableRequestConsumer* cancelable_consumer,
                              base::CancelableTaskTracker* cancelable_tracker)
       : HistoryProviderTask(service, cancelable_consumer, cancelable_tracker),
         result_(0) {}
 
   int Run(const std::string& selection,
           const std::vector<base::string16>& selection_args) {
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&AndroidHistoryProviderService::DeleteHistoryAndBookmarks,
-                   base::Unretained(service()), selection, selection_args,
-                   cancelable_consumer(),
+                   base::Unretained(service()),
+                   selection,
+                   selection_args,
                    base::Bind(&RemoveBookmarksFromAPITask::OnBookmarksRemoved,
-                              base::Unretained(this))));
+                              base::Unretained(this)),
+                   cancelable_tracker()));
     return result_;
   }
 
  private:
-  void OnBookmarksRemoved(AndroidHistoryProviderService::Handle handle,
-                          bool succeeded,
-                          int removed_row_count) {
+  void OnBookmarksRemoved(int removed_row_count) {
     result_ = removed_row_count;
     RequestCompleted();
   }
 
   int result_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveBookmarksFromAPITask);
 };
 
 // Removes history from the API.
 class RemoveHistoryFromAPITask : public HistoryProviderTask {
  public:
   RemoveHistoryFromAPITask(AndroidHistoryProviderService* service,
                            CancelableRequestConsumer* cancelable_consumer,
                            base::CancelableTaskTracker* cancelable_tracker)
       : HistoryProviderTask(service, cancelable_consumer, cancelable_tracker),
         result_(0) {}
 
   int Run(const std::string& selection,
           const std::vector<base::string16>& selection_args) {
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&AndroidHistoryProviderService::DeleteHistory,
-                   base::Unretained(service()), selection,
-                   selection_args, cancelable_consumer(),
+                   base::Unretained(service()),
+                   selection,
+                   selection_args,
                    base::Bind(&RemoveHistoryFromAPITask::OnHistoryRemoved,
-                              base::Unretained(this))));
+                              base::Unretained(this)),
+                   cancelable_tracker()));
     return result_;
   }
 
  private:
-  void OnHistoryRemoved(AndroidHistoryProviderService::Handle handle,
-                        bool succeeded,
-                        int removed_row_count) {
+  void OnHistoryRemoved(int removed_row_count) {
     result_ = removed_row_count;
     RequestCompleted();
   }
 
   int result_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveHistoryFromAPITask);
 };
 
 // This class provides the common method for the SearchTermAPIHelper.
@@ skipping 179 matching lines @@
                                base::CancelableTaskTracker* cancelable_tracker,
                                Profile* profile)
       : SearchTermTask(service,
                        cancelable_consumer,
                        cancelable_tracker,
                        profile),
         result_() {}
 
   int Run(const std::string& selection,
           const std::vector<base::string16>& selection_args) {
-    RunAsyncRequestOnUIThreadBlocking(
-        base::Bind(&AndroidHistoryProviderService::DeleteSearchTerms,
-                   base::Unretained(service()), selection, selection_args,
-                   cancelable_consumer(),
-                   base::Bind(
-                       &RemoveSearchTermsFromAPITask::OnSearchTermsDeleted,
-                       base::Unretained(this))));
+    RunAsyncRequestOnUIThreadBlocking(base::Bind(
+        &AndroidHistoryProviderService::DeleteSearchTerms,
+        base::Unretained(service()),
+        selection,
+        selection_args,
+        base::Bind(&RemoveSearchTermsFromAPITask::OnSearchTermsDeleted,
+                   base::Unretained(this)),
+        cancelable_tracker()));
     return result_;
   }
 
  private:
-  void OnSearchTermsDeleted(AndroidHistoryProviderService::Handle handle,
-                            bool succeeded,
-                            int deleted_row_count) {
+  void OnSearchTermsDeleted(int deleted_row_count) {
     result_ = deleted_row_count;
     RequestCompleted();
   }
 
   int result_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveSearchTermsFromAPITask);
 };
 
 // ------------- Other utility methods (may use tasks) ------------- //
@@ skipping 556 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());
   }
 }