Change AndroidHistoryProviderService to use CancelableTaskTracker (2/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"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 73 matching lines @@
   virtual void OnGetFaviconResult() OVERRIDE {
     base::MessageLoop::current()->Quit();
   }
 
  protected:
   TestingProfileManager profile_manager_;
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   scoped_ptr<AndroidHistoryProviderService> service_;
+  base::CancelableTaskTracker cancelable_tracker_;
   CancelableRequestConsumer cancelable_consumer_;
   TestingProfile* testing_profile_;
   HistoryService* hs_;
 
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SQLiteCursorTest);
 };
 
 class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> {
@@ skipping 11 matching lines @@
     return statement_;
   }
 
   void OnInserted(AndroidHistoryProviderService::Handle handle,
                   bool success,
                   int64 id) {
     success_ = success;
     base::MessageLoop::current()->Quit();
   }
 
-  void OnQueryResult(AndroidHistoryProviderService::Handle handle,
-                     bool success,
-                     AndroidStatement* statement) {
-    success_ = success;
+  void OnQueryResult(AndroidStatement* statement) {
+    success_ = statement != NULL;
     statement_ = statement;
     base::MessageLoop::current()->Quit();
   }
 
  private:
   friend class base::RefCountedThreadSafe<CallbackHelper>;
   ~CallbackHelper() {
   }
 
   bool success_;
@@ skipping 25 matching lines @@
   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);
 
   // Query the inserted row.
-  service_->QueryHistoryAndBookmarks(projections, std::string(),
-      std::vector<base::string16>(), std::string(), &cancelable_consumer_,
-      Bind(&CallbackHelper::OnQueryResult, callback.get()));
+  service_->QueryHistoryAndBookmarks(
+      projections,
+      std::string(),
+      std::vector<base::string16>(),
+      std::string(),
+      Bind(&CallbackHelper::OnQueryResult, callback.get()),
+      &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   ASSERT_TRUE(callback->success());
 
   AndroidStatement* statement = callback->statement();
   std::vector<std::string> column_names;
   column_names.push_back(
       HistoryAndBookmarkRow::GetAndroidName(HistoryAndBookmarkRow::URL));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::LAST_VISIT_TIME));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
@@ skipping 21 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();
 }