Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

chrome/browser/icon_manager.cc

 // Copyright (c) 2011 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/icon_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/task_runner.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace {
 
 void RunCallbackIfNotCanceled(
-    const CancelableTaskTracker::IsCanceledCallback& is_canceled,
+    const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
     const IconManager::IconRequestCallback& callback,
     gfx::Image* image) {
   if (is_canceled.Run())
     return;
   callback.Run(image);
 }
 
 }  // namespace
 
 struct IconManager::ClientRequest {
@@ skipping 20 matching lines @@
 
 gfx::Image* IconManager::LookupIconFromGroup(const IconGroupID& group,
                                              IconLoader::IconSize size) {
   IconMap::iterator it = icon_cache_.find(CacheKey(group, size));
   if (it != icon_cache_.end())
     return it->second;
 
   return NULL;
 }
 
-CancelableTaskTracker::TaskId IconManager::LoadIcon(
+base::CancelableTaskTracker::TaskId IconManager::LoadIcon(
     const base::FilePath& file_name,
     IconLoader::IconSize size,
     const IconRequestCallback& callback,
-    CancelableTaskTracker* tracker) {
+    base::CancelableTaskTracker* tracker) {
   IconLoader* loader = new IconLoader(file_name, size, this);
   loader->AddRef();
   loader->Start();
 
-  CancelableTaskTracker::IsCanceledCallback is_canceled;
-  CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled);
+  base::CancelableTaskTracker::IsCanceledCallback is_canceled;
+  base::CancelableTaskTracker::TaskId id =
+      tracker->NewTrackedTaskId(&is_canceled);
   IconRequestCallback callback_runner = base::Bind(
       &RunCallbackIfNotCanceled, is_canceled, callback);
 
   ClientRequest client_request = { callback_runner, file_name, size };
   requests_[loader] = client_request;
   return id;
 }
 
 // IconLoader::Delegate implementation -----------------------------------------
 
@@ skipping 59 matching lines @@
                                 IconLoader::IconSize size)
     : group(group),
       size(size) {
 }
 
 bool IconManager::CacheKey::operator<(const CacheKey &other) const {
   if (group != other.group)
     return group < other.group;
   return size < other.size;
 }