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

chrome/renderer/searchbox/searchbox.cc

 // 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.
 
 #include "chrome/renderer/searchbox/searchbox.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // Size of the results cache.
 const size_t kMaxInstantAutocompleteResultItemCacheSize = 100;
 
+// Parses |url| and fills in |id| with the InstantRestrictedID obtained from the
+// |url|. |render_view_id| is the ID of the associated RenderView.
+//
+// Valid |url| forms:
+// chrome-search://favicon/<view_id>/<restriced_id> or
+// chrome-search://thumb/<view_id>/<restricted_id>
+//
+// If the |url| is valid, returns true and fills in |id| with restricted_id
+// value. If the |url| is invalid, returns false and |id| is not set.
+bool GetInstantRestrictedIDFromURL(int render_view_id,
+                                   const GURL& url,
+                                   InstantRestrictedID* id) {
+  // Strip leading slash.
+  std::string path = url.path().substr(1);
+
+  // Check that the path is of Most visited item ID form.
+  std::vector<std::string> tokens;
+  if (Tokenize(path, "/", &tokens) != 2)
+    return false;
+
+  int view_id = 0;
+  if (!base::StringToInt(tokens[0], &view_id) || view_id != render_view_id)
+    return false;
+  return base::StringToInt(tokens[1], id);
+}
+
 }  // namespace
 
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       query_is_restricted_(false),
       selection_start_(0),
       selection_end_(0),
       start_margin_(0),
@@ skipping 111 matching lines @@
     InstantRestrictedID autocomplete_result_id,
     InstantAutocompleteResult* result) const {
   return autocomplete_results_cache_.GetItemWithRestrictedID(
       autocomplete_result_id, result);
 }
 
 const ThemeBackgroundInfo& SearchBox::GetThemeBackgroundInfo() {
   return theme_info_;
 }
 
+bool SearchBox::GenerateThumbnailURLFromTransientURL(const GURL& transient_url,
+                                                     GURL* url) const {
+  InstantRestrictedID rid = 0;
+  if (!GetInstantRestrictedIDFromURL(render_view()->GetRoutingID(),
+                                     transient_url, &rid))

[palmer, 2013/06/05 17:50:54]

Nit: curly braces, here and on line 202

[kmadhusu, 2013/06/05 18:40:39]

Done.

+    return false;
+
+  GURL most_visited_item_url(GetURLForMostVisitedItem(rid));
+  if (most_visited_item_url.is_empty())
+    return false;
+  *url = GURL(base::StringPrintf("chrome-search://thumb/%s",
+                                 most_visited_item_url.spec().c_str()));
+  return true;
+}
+
+bool SearchBox::GenerateFaviconURLFromTransientURL(const GURL& transient_url,
+                                                   GURL* url) const {
+  InstantRestrictedID rid = 0;
+  if (!GetInstantRestrictedIDFromURL(render_view()->GetRoutingID(),
+                                     transient_url, &rid))
+    return false;
+
+  GURL most_visited_item_url(GetURLForMostVisitedItem(rid));
+  if (most_visited_item_url.is_empty())
+    return false;
+  *url = GURL(base::StringPrintf("chrome-search://favicon/%s",
+                                 most_visited_item_url.spec().c_str()));
+  return true;
+}
+
 bool SearchBox::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchBox, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxChange, OnChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSubmit, OnSubmit)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxCancel, OnCancel)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPopupResize, OnPopupResize)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMarginChange, OnMarginChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxBarsHidden, OnBarsHidden)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
@@ skipping 230 matching lines @@
   // changes.
 }
 
 void SearchBox::SetQuery(const string16& query, bool verbatim) {
   query_ = query;
   verbatim_ = verbatim;
   query_is_restricted_ = false;
 }
 
 void SearchBox::OnMostVisitedChanged(
-    const std::vector<InstantMostVisitedItemIDPair>& items) {
-  most_visited_items_cache_.AddItemsWithRestrictedID(items);
-
+    const std::vector<InstantMostVisitedItem>& items) {
+  most_visited_items_cache_.AddItems(items);
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMostVisitedChanged(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::GetMostVisitedItems(
     std::vector<InstantMostVisitedItemIDPair>* items) const {
   return most_visited_items_cache_.GetCurrentItems(items);
 }
 
 bool SearchBox::GetMostVisitedItemWithID(
     InstantRestrictedID most_visited_item_id,
     InstantMostVisitedItem* item) const {
   return most_visited_items_cache_.GetItemWithRestrictedID(most_visited_item_id,
                                                            item);
 }
 
 GURL SearchBox::GetURLForMostVisitedItem(InstantRestrictedID item_id) const {
   InstantMostVisitedItem item;
   return GetMostVisitedItemWithID(item_id, &item) ? item.url : GURL();
 }