Move CancelableTaskTracker to //base/task/CancelableTaskTracker.

chrome/browser/bookmarks/bookmark_model.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_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
-#include "chrome/common/cancelable_task_tracker.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 class BookmarkExpandedStateTracker;
 class BookmarkIndex;
 class BookmarkLoadDetails;
@@ skipping 123 matching lines @@
   void set_icon_url(const GURL& icon_url) {
     icon_url_ = icon_url;
   }
 
   const gfx::Image& favicon() const { return favicon_; }
   void set_favicon(const gfx::Image& icon) { favicon_ = icon; }
 
   FaviconState favicon_state() const { return favicon_state_; }
   void set_favicon_state(FaviconState state) { favicon_state_ = state; }
 
-  CancelableTaskTracker::TaskId favicon_load_task_id() const {
+  base::CancelableTaskTracker::TaskId favicon_load_task_id() const {
     return favicon_load_task_id_;
   }
-  void set_favicon_load_task_id(CancelableTaskTracker::TaskId id) {
+  void set_favicon_load_task_id(base::CancelableTaskTracker::TaskId id) {
     favicon_load_task_id_ = id;
   }
 
   // The unique identifier for this node.
   int64 id_;
 
   // The URL of this node. BookmarkModel maintains maps off this URL, so changes
   // to the URL must be done through the BookmarkModel.
   GURL url_;
 
   // The type of this node. See enum above.
   Type type_;
 
   // Date of when this node was created.
   base::Time date_added_;
 
   // Date of the last modification. Only used for folders.
   base::Time date_folder_modified_;
 
   // The favicon of this node.
   gfx::Image favicon_;
 
   // The URL of the node's favicon.
   GURL icon_url_;
 
   // The loading state of the favicon.
   FaviconState favicon_state_;
 
-  // If not CancelableTaskTracker::kBadTaskId, it indicates we're loading the
+  // If not base::CancelableTaskTracker::kBadTaskId, it indicates
+  // we're loading the
   // favicon and the task is tracked by CancelabelTaskTracker.
-  CancelableTaskTracker::TaskId favicon_load_task_id_;
+  base::CancelableTaskTracker::TaskId favicon_load_task_id_;
 
   // A map that stores arbitrary meta information about the node.
   scoped_ptr<MetaInfoMap> meta_info_map_;
 
   // The sync transaction version. Defaults to kInvalidSyncTransactionVersion.
   int64 sync_transaction_version_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkNode);
 };
 
@@ skipping 343 matching lines @@
 
   // Set of nodes ordered by URL. This is not a map to avoid copying the
   // urls.
   // WARNING: |nodes_ordered_by_url_set_| is accessed on multiple threads. As
   // such, be sure and wrap all usage of it around |url_lock_|.
   typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet;
   NodesOrderedByURLSet nodes_ordered_by_url_set_;
   base::Lock url_lock_;
 
   // Used for loading favicons.
-  CancelableTaskTracker cancelable_task_tracker_;
+  base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Reads/writes bookmarks to disk.
   scoped_refptr<BookmarkStorage> store_;
 
   scoped_ptr<BookmarkIndex> index_;
 
   base::WaitableEvent loaded_signal_;
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_