Most visited thumbnails and favicons need id-based urls

chrome/renderer/searchbox/searchbox.h

Index: chrome/renderer/searchbox/searchbox.h
diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h
index 8b60a4b9bcb71afaa5ca3dbb622f0ed169282aad..b47471f1a25b724a7d0c2dab26e02d660a5ac470 100644
--- a/chrome/renderer/searchbox/searchbox.h
+++ b/chrome/renderer/searchbox/searchbox.h
@@ -49,13 +49,14 @@ class SearchBox : public content::RenderViewObserver,
                      content::PageTransition transition,
                      WindowOpenDisposition disposition);
 
-  // Sends ChromeViewHostMsg_InstantDeleteMostVisitedItem to the browser.
-  void DeleteMostVisitedItem(int restrict_id);
+  // Sends ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem to the browser.
+  void DeleteMostVisitedItem(uint64 restricted_id);
 
-  // Sends ChromeViewHostMsg_InstantUndoMostVisitedDeletion to the browser.
-  void UndoMostVisitedDeletion(int restrict_id);
+  // Sends ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion to the browser.
+  void UndoMostVisitedDeletion(uint64 restricted_id);
 
-  // Sends ChromeViewHostMsg_InstantUndoAllMostVisitedDeletions to the browser.
+  // Sends ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions to the
+  // browser.
   void UndoAllMostVisitedDeletions();
 
   const string16& query() const { return query_; }
@@ -78,17 +79,11 @@ class SearchBox : public content::RenderViewObserver,
   const std::vector<InstantAutocompleteResult>& GetAutocompleteResults();
   // Searchbox retains ownership of this object.
   const InstantAutocompleteResult*
-      GetAutocompleteResultWithId(size_t restricted_id) const;
+      GetAutocompleteResultWithId(uint64 restricted_id) const;
   const ThemeBackgroundInfo& GetThemeBackgroundInfo();
 
   // Most Visited items.
-  const std::vector<MostVisitedItem>& GetMostVisitedItems();
-
-  // Secure Urls.
-  int UrlToRestrictedId(const string16 url);
-  string16 RestrictedIdToURL(int id);
-  string16 GenerateThumbnailUrl(int id);
-  string16 GenerateFaviconUrl(int id);
+  const std::vector<InstantMostVisitedItem>& GetMostVisitedItems() const;
 
  private:
   // Overridden from content::RenderViewObserver:
@@ -115,7 +110,7 @@ class SearchBox : public content::RenderViewObserver,
   void OnFontInformationReceived(const string16& omnibox_font,
                                  size_t omnibox_font_size);
   void OnGrantChromeSearchAccessFromOrigin(const GURL& origin_url);
-  void OnMostVisitedChanged(const std::vector<MostVisitedItem>& items);
+  void OnMostVisitedChanged(const std::vector<InstantMostVisitedItem>& items);
 
   // Returns the current zoom factor of the render view or 1 on failure.
   double GetZoom() const;
@@ -138,14 +133,7 @@ class SearchBox : public content::RenderViewObserver,
   bool display_instant_results_;
   string16 omnibox_font_;
   size_t omnibox_font_size_;
-  std::vector<MostVisitedItem> most_visited_items_;
-
-  // URL to Restricted Id mapping.
-  // TODO(dcblack): Unify this logic to work with both Most Visited and
-  // history suggestions.  (crbug/175768)
-  std::map<string16, int> url_to_restricted_id_map_;
-  std::map<int, string16> restricted_id_to_url_map_;
-  int last_restricted_id_;
+  std::vector<InstantMostVisitedItem> most_visited_items_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };