Change AndroidHistoryProviderService to use CancelableTaskTracker (2/6)

chrome/browser/history/android/android_history_provider_service_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/android_history_provider_service.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/history/android/android_history_types.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 46 matching lines @@
     profile_manager_.DeleteTestingProfile(chrome::kInitialProfile);
     testing_profile_=NULL;
   }
 
  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_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderServiceTest);
 };
 
 class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> {
  public:
   CallbackHelper()
@@ skipping 19 matching lines @@
     return count_;
   }
 
   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();
   }
 
   void OnUpdated(AndroidHistoryProviderService::Handle handle,
                  bool success,
                  int count) {
     success_ = success;
     count_ = count;
     base::MessageLoop::current()->Quit();
@@ skipping 37 matching lines @@
   service_->InsertHistoryAndBookmark(row, &cancelable_consumer_,
       Bind(&CallbackHelper::OnInserted, callback.get()));
 
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::ID);
 
   // 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());
 
   // Move the cursor to the begining and verify whether we could get
   // the same result.
   AndroidStatement* statement = callback->statement();
   service_->MoveStatement(statement, 0, -1, &cancelable_consumer_,
       Bind(&CallbackHelper::OnStatementMoved, callback.get()));
   base::MessageLoop::current()->Run();
   EXPECT_EQ(-1, callback->cursor_position());
@@ skipping 33 matching lines @@
   service_->InsertSearchTerm(search_row, &cancelable_consumer_,
       Bind(&CallbackHelper::OnInserted, callback.get()));
 
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
 
   std::vector<SearchRow::ColumnID> projections;
   projections.push_back(SearchRow::ID);
 
   // Query the inserted row.
-  service_->QuerySearchTerms(projections, std::string(),
-      std::vector<base::string16>(), std::string(), &cancelable_consumer_,
-      Bind(&CallbackHelper::OnQueryResult, callback.get()));
+  service_->QuerySearchTerms(
+      projections,
+      std::string(),
+      std::vector<base::string16>(),
+      std::string(),
+      Bind(&CallbackHelper::OnQueryResult, callback.get()),
+      &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   ASSERT_TRUE(callback->success());
 
   // Move the cursor to the begining and verify whether we could get
   // the same result.
   AndroidStatement* statement = callback->statement();
   service_->MoveStatement(statement, 0, -1, &cancelable_consumer_,
       Bind(&CallbackHelper::OnStatementMoved, callback.get()));
   base::MessageLoop::current()->Run();
   EXPECT_EQ(-1, callback->cursor_position());
@@ skipping 13 matching lines @@
 
   // Delete the row.
   service_->DeleteSearchTerms(std::string(), std::vector<base::string16>(),
       &cancelable_consumer_, Bind(&CallbackHelper::OnDeleted, callback.get()));
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 }  // namespace