Change AndroidHistoryProviderService to use CancelableTaskTracker (4/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 <list>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 724 matching lines @@
 class AddBookmarkFromAPITask : public HistoryProviderTask {
  public:
   AddBookmarkFromAPITask(AndroidHistoryProviderService* service,
                          CancelableRequestConsumer* cancelable_consumer,
                          base::CancelableTaskTracker* cancelable_tracker)
       : HistoryProviderTask(service, cancelable_consumer, cancelable_tracker) {}
 
   history::URLID Run(const history::HistoryAndBookmarkRow& row) {
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&AndroidHistoryProviderService::InsertHistoryAndBookmark,
-                   base::Unretained(service()), row, cancelable_consumer(),
+                   base::Unretained(service()),
+                   row,
                    base::Bind(&AddBookmarkFromAPITask::OnBookmarkInserted,
-                              base::Unretained(this))));
+                              base::Unretained(this)),
+                   cancelable_tracker()));
     return result_;
   }
 
  private:
-  void OnBookmarkInserted(AndroidHistoryProviderService::Handle handle,
-                          bool succeeded,
-                          history::URLID id) {
-    // Note that here 0 means an invalid id too.
+  void OnBookmarkInserted(history::URLID id) {
+    // Note that here 0 means an invalid id.
     // This is because it represents a SQLite database row id.
     result_ = id;
     RequestCompleted();
   }
 
   history::URLID result_;
 
   DISALLOW_COPY_AND_ASSIGN(AddBookmarkFromAPITask);
 };
 
@@ skipping 192 matching lines @@
         base::Bind(&AddSearchTermFromAPITask::MakeRequestOnUIThread,
                    base::Unretained(this), row));
     return result_;
   }
 
  private:
   void MakeRequestOnUIThread(const history::SearchRow& row) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     history::SearchRow internal_row = row;
     BuildSearchRow(&internal_row);
-    service()->InsertSearchTerm(internal_row, cancelable_consumer(),
+    service()->InsertSearchTerm(
+        internal_row,
         base::Bind(&AddSearchTermFromAPITask::OnSearchTermInserted,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        cancelable_tracker());
   }
 
-  void OnSearchTermInserted(AndroidHistoryProviderService::Handle handle,
-                            bool succeeded,
-                            history::URLID id) {
-    // Note that here 0 means an invalid id too.
+  void OnSearchTermInserted(history::URLID id) {
+    // Note that here 0 means an invalid id.
     // This is because it represents a SQLite database row id.
     result_ = id;
     RequestCompleted();
   }
 
   history::URLID result_;
 
   DISALLOW_COPY_AND_ASSIGN(AddSearchTermFromAPITask);
 };
 
@@ skipping 690 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());
   }
 }