Unpin deleted URLs + better deleting algorithm.

chrome/browser/history/top_sites.h

 // Copyright (c) 2009 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_H_
 #define CHROME_BROWSER_HISTORY_TOP_SITES_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 124 matching lines @@
   // is a URL pinned at |index|.
   bool GetPinnedURLAtIndex(size_t index, GURL* out);
 
  private:
   friend class base::RefCountedThreadSafe<TopSites>;
   friend class TopSitesTest;
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, GetMostVisited);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, RealDatabase);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, MockDatabase);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, DeleteNotifications);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, PinnedURLsDeleted);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, GetUpdateDelay);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, Migration);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, QueueingRequestsForTopSites);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, CancelingRequestsForTopSites);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, AddTemporaryThumbnail);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, Blacklisting);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, PinnedURLs);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, BlacklistingAndPinnedURLs);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, AddPrepopulatedPages);
   FRIEND_TEST_ALL_PREFIXES(TopSitesTest, GetIndexForChromeStore);
@@ skipping 21 matching lines @@
   void StartQueryForThumbnail(size_t index);
 
   // Called when history service returns a list of top URLs.
   void OnTopSitesAvailable(CancelableRequestProvider::Handle handle,
                            MostVisitedURLList data);
 
   // Called when history service returns a thumbnail.
   void OnThumbnailAvailable(CancelableRequestProvider::Handle handle,
                             scoped_refptr<RefCountedBytes> thumbnail);
 
+  // Sets canonical_urls_ from top_sites_.
+  void GenerateCanonicalURLs();
+
   // Saves the set of the top URLs visited by this user. The 0th item is the
   // most popular.
   // DANGER! This will clear all data from the input argument.
   void StoreMostVisited(MostVisitedURLList* most_visited);
 
   // Saves the given set of redirects. The redirects are in order of the
   // given vector, so [0] -> [1] -> [2].
   void StoreRedirectChain(const RedirectList& redirects,
                           size_t destination);
 
@@ skipping 154 matching lines @@
   // index where it is pinned at (may be the same as key). This is
   // owned by the PrefService.
   DictionaryValue* pinned_urls_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSites);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_TOP_SITES_H_