Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

chrome/browser/ui/cocoa/history_menu_bridge.mm

 // 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/ui/cocoa/history_menu_bridge.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 37 matching lines @@
 
 // The number of visisted results to get.
 const int kVisitedCount = 15;
 
 // The number of recently closed items to get.
 const unsigned int kRecentlyClosedCount = 10;
 
 }  // namespace
 
 HistoryMenuBridge::HistoryItem::HistoryItem()
-   : icon_requested(false),
-     icon_task_id(CancelableTaskTracker::kBadTaskId),
-     menu_item(nil),
-     session_id(0) {
-}
+    : icon_requested(false),
+      icon_task_id(base::CancelableTaskTracker::kBadTaskId),
+      menu_item(nil),
+      session_id(0) {}
 
 HistoryMenuBridge::HistoryItem::HistoryItem(const HistoryItem& copy)
-   : title(copy.title),
-     url(copy.url),
-     icon_requested(false),
-     icon_task_id(CancelableTaskTracker::kBadTaskId),
-     menu_item(nil),
-     session_id(copy.session_id) {
-}
+    : title(copy.title),
+      url(copy.url),
+      icon_requested(false),
+      icon_task_id(base::CancelableTaskTracker::kBadTaskId),
+      menu_item(nil),
+      session_id(copy.session_id) {}
 
 HistoryMenuBridge::HistoryItem::~HistoryItem() {
 }
 
 HistoryMenuBridge::HistoryMenuBridge(Profile* profile)
     : controller_([[HistoryMenuCocoaController alloc] initWithBridge:this]),
       profile_(profile),
       history_service_(NULL),
       tab_restore_service_(NULL),
       create_in_progress_(false),
@@ skipping 369 matching lines @@
 
   // Tab navigations don't come with icons, so we always have to request them.
   GetFaviconForHistoryItem(item);
 
   return item;
 }
 
 void HistoryMenuBridge::GetFaviconForHistoryItem(HistoryItem* item) {
   FaviconService* service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  CancelableTaskTracker::TaskId task_id = service->GetFaviconImageForURL(
-      FaviconService::FaviconForURLParams(item->url,
-                                          chrome::FAVICON,
-                                          gfx::kFaviconSize),
-      base::Bind(&HistoryMenuBridge::GotFaviconData,
-                 base::Unretained(this),
-                 item),
+  base::CancelableTaskTracker::TaskId task_id = service->GetFaviconImageForURL(
+      FaviconService::FaviconForURLParams(
+          item->url, chrome::FAVICON, gfx::kFaviconSize),
+      base::Bind(
+          &HistoryMenuBridge::GotFaviconData, base::Unretained(this), item),
       &cancelable_task_tracker_);
   item->icon_task_id = task_id;
   item->icon_requested = true;
 }
 
 void HistoryMenuBridge::GotFaviconData(
     HistoryItem* item,
     const chrome::FaviconImageResult& image_result) {
   // Since we're going to do Cocoa-y things, make sure this is the main thread.
   DCHECK([NSThread isMainThread]);
 
   DCHECK(item);
   item->icon_requested = false;
-  item->icon_task_id = CancelableTaskTracker::kBadTaskId;
+  item->icon_task_id = base::CancelableTaskTracker::kBadTaskId;
 
   NSImage* image = image_result.image.AsNSImage();
   if (image) {
     item->icon.reset([image retain]);
     [item->menu_item setImage:item->icon.get()];
   }
 }
 
 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
   DCHECK(item);
   if (item->icon_requested) {
     cancelable_task_tracker_.TryCancel(item->icon_task_id);
     item->icon_requested = false;
-    item->icon_task_id = CancelableTaskTracker::kBadTaskId;
+    item->icon_task_id = base::CancelableTaskTracker::kBadTaskId;
   }
 }