Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

chrome/browser/sync/glue/favicon_cache.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_FAVICON_CACHE_H_
 #define CHROME_BROWSER_SYNC_GLUE_FAVICON_CACHE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/syncable_service.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace chrome {
@@ skipping 79 matching lines @@
     bool operator()(const linked_ptr<SyncedFaviconInfo>& lhs,
                     const linked_ptr<SyncedFaviconInfo>& rhs) const;
   };
 
 
   // Map of favicon url to favicon image.
   typedef std::map<GURL, linked_ptr<SyncedFaviconInfo> > FaviconMap;
   typedef std::set<linked_ptr<SyncedFaviconInfo>,
                    FaviconRecencyFunctor> RecencySet;
   // Map of page url to task id (for favicon loading).
-  typedef std::map<GURL, CancelableTaskTracker::TaskId> PageTaskMap;
+  typedef std::map<GURL, base::CancelableTaskTracker::TaskId> PageTaskMap;
   // Map of page url to favicon url.
   typedef std::map<GURL, GURL> PageFaviconMap;
 
   // Helper method to perform OnReceivedSyncFavicon work without worrying about
   // whether caller holds a sync transaction.
   void OnReceivedSyncFaviconImpl(const GURL& icon_url,
                                  const std::string& icon_bytes,
                                  int64 visit_time_ms);
 
   // Callback method to store a tab's favicon into its sync node once it becomes
@@ skipping 56 matching lines @@
                            syncer::SyncChangeList* tracking_changes);
 
   // Locally drops the favicon pointed to by |favicon_iter|.
   void DropSyncedFavicon(FaviconMap::iterator favicon_iter);
 
   // For testing only.
   size_t NumFaviconsForTest() const;
   size_t NumTasksForTest() const;
 
   // Trask tracker for loading favicons.
-  CancelableTaskTracker cancelable_task_tracker_;
+  base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Our actual cached favicon data.
   FaviconMap synced_favicons_;
 
   // An LRU ordering of the favicons comprising |synced_favicons_| (oldest to
   // newest).
   RecencySet recent_favicons_;
 
   // Our set of pending favicon loads, indexed by page url.
   PageTaskMap page_task_map_;
@@ skipping 17 matching lines @@
 
   // Weak pointer factory for favicon loads.
   base::WeakPtrFactory<FaviconCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconCache);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_FAVICON_CACHE_H_