Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

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"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/provider/blocking_ui_thread_async_request.h"
 #include "chrome/browser/android/provider/bookmark_model_observer_task.h"
 #include "chrome/browser/android/provider/run_on_ui_thread_blocking.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "chrome/browser/history/android/sqlite_cursor.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "jni/ChromeBrowserProvider_jni.h"
 #include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/favicon_size.h"
 
@@ skipping 589 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AsyncServiceRequest);
 };
 
 // Base class for all asynchronous blocking tasks that use the favicon service.
 class FaviconServiceTask : public AsyncServiceRequest<FaviconService> {
  public:
   FaviconServiceTask(FaviconService* service,
                      Profile* profile,
                      CancelableRequestConsumer* cancelable_consumer,
-                     CancelableTaskTracker* cancelable_tracker)
+                     base::CancelableTaskTracker* cancelable_tracker)
       : AsyncServiceRequest<FaviconService>(service, cancelable_consumer),
         profile_(profile),
         cancelable_tracker_(cancelable_tracker) {}
 
   Profile* profile() const { return profile_; }
-  CancelableTaskTracker* cancelable_tracker() const {
+  base::CancelableTaskTracker* cancelable_tracker() const {
     return cancelable_tracker_;
   }
 
  private:
   Profile* profile_;
-  CancelableTaskTracker* cancelable_tracker_;
+  base::CancelableTaskTracker* cancelable_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconServiceTask);
 };
 
 // Retrieves the favicon or touch icon for a URL from the FaviconService.
 class BookmarkIconFetchTask : public FaviconServiceTask {
  public:
-  BookmarkIconFetchTask(
-      FaviconService* favicon_service,
-      Profile* profile,
-      CancelableRequestConsumer* cancelable_consumer,
-      CancelableTaskTracker* cancelable_tracker)
-      : FaviconServiceTask(favicon_service, profile,
-                           cancelable_consumer, cancelable_tracker) {}
+  BookmarkIconFetchTask(FaviconService* favicon_service,
+                        Profile* profile,
+                        CancelableRequestConsumer* cancelable_consumer,
+                        base::CancelableTaskTracker* cancelable_tracker)
+      : FaviconServiceTask(favicon_service,
+                           profile,
+                           cancelable_consumer,
+                           cancelable_tracker) {}
 
   chrome::FaviconBitmapResult Run(const GURL& url) {
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&FaviconService::GetRawFaviconForURL,
                    base::Unretained(service()),
                    FaviconService::FaviconForURLParams(
                        url,
                        chrome::FAVICON | chrome::TOUCH_ICON,
                        gfx::kFaviconSize),
                    ResourceBundle::GetSharedInstance().GetMaxScaleFactor(),
@@ skipping 932 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());
   }
 }