Change AndroidHistoryProviderService to use CancelableTaskTracker (4/6)

chrome/browser/history/android/sqlite_cursor_unittest.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/sqlite_cursor.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 111 matching lines @@
   }
 
   bool success() const {
     return success_;
   }
 
   AndroidStatement* statement() const {
     return statement_;
   }
 
-  void OnInserted(AndroidHistoryProviderService::Handle handle,
-                  bool success,
-                  int64 id) {
-    success_ = success;
+  void OnInserted(int64 id) {
+    success_ = id != 0;
     base::MessageLoop::current()->Quit();
   }
 
   void OnQueryResult(AndroidStatement* statement) {
     success_ = statement != NULL;
     statement_ = statement;
     base::MessageLoop::current()->Quit();
   }
 
  private:
@@ skipping 17 matching lines @@
   favicon_data.push_back(1);
   base::RefCountedBytes *data_bytes =
       base::RefCountedBytes::TakeVector(&favicon_data);
   row.set_favicon(data_bytes);
   row.set_last_visit_time(Time::Now());
   row.set_visit_count(2);
   row.set_title(base::UTF8ToUTF16("cnn"));
   scoped_refptr<CallbackHelper> callback(new CallbackHelper());
 
   // Insert a row and verify it succeeded.
-  service_->InsertHistoryAndBookmark(row, &cancelable_consumer_,
-      Bind(&CallbackHelper::OnInserted, callback.get()));
+  service_->InsertHistoryAndBookmark(
+      row,
+      Bind(&CallbackHelper::OnInserted, callback.get()),
+      &cancelable_tracker_);
 
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
   projections.push_back(HistoryAndBookmarkRow::FAVICON);
 
@@ skipping 39 matching lines @@
       cursor->GetBlob(env, NULL, 3);
   std::vector<uint8> out;
   base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
   EXPECT_EQ(data_bytes->data().size(), out.size());
   EXPECT_EQ(data_bytes->data()[0], out[0]);
   cursor->Destroy(env, NULL);
   // Cursor::Destroy posts the task in UI thread, run Message loop to release
   // the statement, delete SQLiteCursor itself etc.
   content::RunAllPendingInMessageLoop();
 }