Rip out browser-side RID caching for most visited items.

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 ec58f40b92332a09251409b0de4efe908062f859..0b4fc960e15e810880aa876fe75287f2974e0f9e 100644
--- a/chrome/renderer/searchbox/searchbox.h
+++ b/chrome/renderer/searchbox/searchbox.h
@@ -114,6 +114,20 @@ class SearchBox : public content::RenderViewObserver,
   // browser.
   void UndoAllMostVisitedDeletions();
 
+  // Generates the thumbnail URL of the most visited item specified by the
+  // |most_visited_item_id|. If the |most_visited_item_id| is valid, returns
+  // true and fills in |url|. If the |most_visited_item_id| is invalid, returns
+  // false and |url| is not set.
+  bool GenerateThumbnailURLFromRID(InstantRestrictedID most_visited_item_id,
+                                   GURL* url) const;
+
+  // Generates the favicon URL of the most visited item specified by the
+  // |most_visited_item_id|. If the |most_visited_item_id| is valid, returns
+  // true and fills in |url|. If the |most_visited_item_id| is invalid, returns
+  // false and |url| is not set.
+  bool GenerateFaviconURLFromRID(InstantRestrictedID most_visited_item_id,
+                                 GURL* url) const;
+
  private:
   // Overridden from content::RenderViewObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@@ -144,7 +158,7 @@ class SearchBox : public content::RenderViewObserver,
   void OnFontInformationReceived(const string16& omnibox_font,
                                  size_t omnibox_font_size);
   void OnMostVisitedChanged(
-      const std::vector<InstantMostVisitedItemIDPair>& items);
+      const std::vector<InstantMostVisitedItem>& items);
 
   // Returns the current zoom factor of the render view or 1 on failure.
   double GetZoom() const;