Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

chrome/browser/jumplist_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_JUMPLIST_WIN_H_
 #define CHROME_BROWSER_JUMPLIST_WIN_H_
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
-#include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace chrome {
 struct FaviconImageResult;
 }
@@ skipping 77 matching lines @@
 // * Adding COM objects to JumpList, etc.
 //
 // This class also implements TabRestoreServiceObserver. So, once we call
 // AddObserver() and register this class as an observer, it automatically
 // updates a JumpList when a tab is added or removed.
 //
 // Updating a JumpList requires some file operations and it is not good to
 // update it in a UI thread. To solve this problem, this class posts to a
 // runnable method when it actually updates a JumpList.
 //
-// Note. CancelableTaskTracker is not thread safe, so we always delete JumpList
-// on UI thread (the same thread it got constructed on).
+// Note. base::CancelableTaskTracker is not thread safe, so we
+// always delete JumpList on UI thread (the same thread it got constructed on).
 class JumpList : public TabRestoreServiceObserver,
                  public content::NotificationObserver,
                  public base::RefCountedThreadSafe<
                      JumpList, content::BrowserThread::DeleteOnUIThread> {
  public:
   JumpList();
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 81 matching lines @@
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<JumpList>;
   ~JumpList();
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<JumpList> weak_ptr_factory_;
 
   // Tracks FaviconService tasks.
-  CancelableTaskTracker cancelable_task_tracker_;
+  base::CancelableTaskTracker cancelable_task_tracker_;
 
   // The Profile object is used to listen for events
   Profile* profile_;
 
   // Lives on the UI thread.
   scoped_ptr<content::NotificationRegistrar> registrar_;
 
   // App id to associate with the jump list.
   std::wstring app_id_;
 
   // The directory which contains JumpList icons.
   base::FilePath icon_dir_;
 
   // Items in the "Most Visited" category of the application JumpList,
   // protected by the list_lock_.
   ShellLinkItemList most_visited_pages_;
 
   // Items in the "Recently Closed" category of the application JumpList,
   // protected by the list_lock_.
   ShellLinkItemList recently_closed_pages_;
 
   // A list of URLs we need to retrieve their favicons,
   // protected by the list_lock_.
   typedef std::pair<std::string, scoped_refptr<ShellLinkItem> > URLPair;
   std::list<URLPair> icon_urls_;
 
   // Id of last favicon task. It's used to cancel current task if a new one
   // comes in before it finishes.
-  CancelableTaskTracker::TaskId task_id_;
+  base::CancelableTaskTracker::TaskId task_id_;
 
   // Lock for most_visited_pages_, recently_closed_pages_, icon_urls_
   // as they may be used by up to 3 threads.
   base::Lock list_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(JumpList);
 };
 
 #endif  // CHROME_BROWSER_JUMPLIST_WIN_H_