Remove dead code

chrome/browser/history/top_sites_impl.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_HISTORY_TOP_SITES_IMPL_H_
 #define CHROME_BROWSER_HISTORY_TOP_SITES_IMPL_H_
 
 #include <list>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/top_sites_backend.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
@@ skipping 39 matching lines @@
                                      ThumbnailScore* score) OVERRIDE;
   virtual bool GetTemporaryPageThumbnailScore(const GURL& url,
                                               ThumbnailScore* score) OVERRIDE;
   virtual void SyncWithHistory() OVERRIDE;
   virtual bool HasBlacklistedItems() const OVERRIDE;
   virtual void AddBlacklistedURL(const GURL& url) OVERRIDE;
   virtual void RemoveBlacklistedURL(const GURL& url) OVERRIDE;
   virtual bool IsBlacklisted(const GURL& url) OVERRIDE;
   virtual void ClearBlacklistedURLs() OVERRIDE;
   virtual void Shutdown() OVERRIDE;
-  virtual CancelableRequestProvider::Handle StartQueryForMostVisited() OVERRIDE;
+  virtual base::CancelableTaskTracker::TaskId StartQueryForMostVisited()
+      OVERRIDE;
   virtual bool IsKnownURL(const GURL& url) OVERRIDE;
   virtual const std::string& GetCanonicalURLString(
       const GURL& url) const OVERRIDE;
   virtual bool IsNonForcedFull() OVERRIDE;
   virtual bool IsForcedFull() OVERRIDE;
   virtual MostVisitedURLList GetPrepopulatePages() OVERRIDE;
   virtual bool loaded() const OVERRIDE;
   virtual bool AddForcedURL(const GURL& url, const base::Time& time) OVERRIDE;
 
  protected:
@@ skipping 133 matching lines @@
   // Copy of the top sites data that may be accessed on any thread (assuming
   // you hold |lock_|). The data in |thread_safe_cache_| has blacklisted and
   // pinned urls applied (|cache_| does not).
   scoped_ptr<TopSitesCache> thread_safe_cache_;
 
   Profile* profile_;
 
   // Lock used to access |thread_safe_cache_|.
   mutable base::Lock lock_;
 
-  // Need a separate consumer for each CancelableRequestProvider we interact
-  // with (HistoryService and TopSitesBackend).
-  CancelableRequestConsumer history_consumer_;
-  base::CancelableTaskTracker cancelable_task_tracker_;
+  // Need a separate task tracker  for each CancelableRequestProvider we

[blundell, 2014/07/03 08:29:12]

comment is out of date

[sdefresne, 2014/07/22 14:29:06]

Done.

+  // interact with (HistoryService and TopSitesBackend).
+  base::CancelableTaskTracker history_task_tracker_;
+  base::CancelableTaskTracker backend_task_tracker_;
 
   // Timer that asks history for the top sites. This is used to make sure our
   // data stays in sync with history.
   base::OneShotTimer<TopSitesImpl> timer_;
 
   // The time we started |timer_| at. Only valid if |timer_| is running.
   base::TimeTicks timer_start_time_;
 
   content::NotificationRegistrar registrar_;
 
@@ skipping 16 matching lines @@
 
   // Are we loaded?
   bool loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSitesImpl);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_TOP_SITES_IMPL_H_