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

chrome/renderer/searchbox/searchbox.h

 // Copyright 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_RENDERER_SEARCHBOX_SEARCHBOX_H_
 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 96 matching lines @@
   // Sends ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem to the browser.
   void DeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
 
   // Sends ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion to the browser.
   void UndoMostVisitedDeletion(InstantRestrictedID most_visited_item_id);
 
   // Sends ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions to the
   // 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;
 
   void OnChange(const string16& query,
                 bool verbatim,
                 size_t selection_start,
                 size_t selection_end);
   void OnSubmit(const string16& query);
   void OnCancel(const string16& query);
@@ skipping 10 matching lines @@
                          size_t selection_start,
                          size_t selection_end);
   void OnFocusChanged(OmniboxFocusState new_focus_state,
                       OmniboxFocusChangeReason reason);
   void OnSetDisplayInstantResults(bool display_instant_results);
   void OnThemeChanged(const ThemeBackgroundInfo& theme_info);
   void OnThemeAreaHeightChanged(int height);
   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;
 
   // Sets the searchbox values to their initial value.
   void Reset();
 
   // Sets the query to a new value.
   void SetQuery(const string16& query, bool verbatim);
 
@@ skipping 14 matching lines @@
   string16 omnibox_font_;
   size_t omnibox_font_size_;
   InstantRestrictedIDCache<InstantAutocompleteResult>
       autocomplete_results_cache_;
   InstantRestrictedIDCache<InstantMostVisitedItem> most_visited_items_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };
 
 #endif  // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_