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

chrome/renderer/searchbox/searchbox_extension.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_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 73 matching lines @@
   if (!frame) return;
   frame->executeScript(WebKit::WebScriptSource(script));
 }
 
 v8::Handle<v8::String> GenerateThumbnailURL(uint64 most_visited_item_id) {
   return UTF8ToV8String(
       base::StringPrintf("chrome-search://thumb/%s",
                          base::Uint64ToString(most_visited_item_id).c_str()));
 }
 
-v8::Handle<v8::String> GenerateFaviconURL(uint64 most_visited_item_id) {
+v8::Handle<v8::String> GenerateThumbnailURL(const GURL& url) {

[Jered, 2013/05/31 17:34:33]

Instead of overloading based on types, give these functions different names like
GenerateThumbnailURLFromRID() and GenerateThumbnailURL().

[kmadhusu, 2013/06/04 02:36:01]

Done. As per the next comment, I moved GenerateThumbnailURLFromRID to
SearchBox.cc.

   return UTF8ToV8String(
-      base::StringPrintf("chrome-search://favicon/%s",
-                         base::Uint64ToString(most_visited_item_id).c_str()));
+      base::StringPrintf("chrome-search://thumb/%s", url.spec().c_str()));
+}
+
+v8::Handle<v8::String> GenerateFaviconURL(const GURL& url) {
+  return UTF8ToV8String(
+      base::StringPrintf("chrome-search://favicon/%s", url.spec().c_str()));
 }
 
 // If |url| starts with |prefix|, removes |prefix|.
 void StripPrefix(string16* url, const string16& prefix) {
   if (StartsWith(*url, prefix, true))
     url->erase(0, prefix.length());
 }
 
 // Removes leading "http://" or "http://www." from |url| unless |user_input|
 // starts with those prefixes.
@@ skipping 52 matching lines @@
   obj->Set(v8::String::New("rid"), v8::Uint32::New(restricted_id));
 
   v8::Handle<v8::Object> ranking_data = v8::Object::New();
   ranking_data->Set(v8::String::New("relevance"),
                     v8::Int32::New(result.relevance));
   obj->Set(v8::String::New("rankingData"), ranking_data);
   return obj;
 }
 
 // Populates a Javascript MostVisitedItem object from |mv_item|.
+//
+// Set |privileged_mode| to true to set the most visited item url in thumbnail

[Jered, 2013/05/31 17:34:33]

Instead of doing this, how about always specifying the URLs in terms of RIDs,
but rewriting them in ChromeContentRendererClient?

That way the page never deals with URLs explicitly, but the requests from
renderer -> browser are still always framed in terms of URLs.

[kmadhusu, 2013/06/04 02:36:01]

Done.

+// URL.
+//
 // NOTE: Includes "url", "title" and "domain" which are private data, so should
 // not be returned to the Instant page. These should be erased before returning
 // the object. See GetMostVisitedItemsWrapper() in searchbox_api.js.
 v8::Handle<v8::Object> GenerateMostVisitedItem(
     InstantRestrictedID restricted_id,
-    const InstantMostVisitedItem &mv_item) {
+    const InstantMostVisitedItem &mv_item,
+    bool privileged_mode) {
   // We set the "dir" attribute of the title, so that in RTL locales, a LTR
   // title is rendered left-to-right and truncated from the right. For
   // example, the title of http://msdn.microsoft.com/en-us/default.aspx is
   // "MSDN: Microsoft developer network". In RTL locales, in the New Tab
   // page, if the "dir" of this title is not specified, it takes Chrome UI's
   // directionality. So the title will be truncated as "soft developer
   // network". Setting the "dir" attribute as "ltr" renders the truncated
   // title as "MSDN: Microsoft D...". As another example, the title of
   // http://yahoo.com is "Yahoo!". In RTL locales, in the New Tab page, the
   // title will be rendered as "!Yahoo" if its "dir" attribute is not set to
   // "ltr".
   std::string direction;
   if (base::i18n::StringContainsStrongRTLChars(mv_item.title))
     direction = kRTLHtmlTextDirection;
   else
     direction = kLTRHtmlTextDirection;
 
   string16 title = mv_item.title;
   if (title.empty())
     title = UTF8ToUTF16(mv_item.url.spec());
 
   v8::Handle<v8::Object> obj = v8::Object::New();
   obj->Set(v8::String::New("rid"), v8::Int32::New(restricted_id));
   obj->Set(v8::String::New("thumbnailUrl"),
-           GenerateThumbnailURL(restricted_id));
-  obj->Set(v8::String::New("faviconUrl"),
-           GenerateFaviconURL(restricted_id));
+           privileged_mode ? GenerateThumbnailURL(mv_item.url) :
+                             GenerateThumbnailURL(restricted_id));
+  obj->Set(v8::String::New("faviconUrl"), GenerateFaviconURL(mv_item.url));

[Jered, 2013/05/31 17:34:33]

This is priveleged.

[kmadhusu, 2013/06/04 02:36:01]

Fixed.

   obj->Set(v8::String::New("title"), UTF16ToV8String(title));
   obj->Set(v8::String::New("domain"), UTF8ToV8String(mv_item.url.host()));
   obj->Set(v8::String::New("direction"), UTF8ToV8String(direction));
   obj->Set(v8::String::New("url"), UTF8ToV8String(mv_item.url.spec()));
   return obj;
 }
 
 // Returns the render view for the current JS context if it matches |origin|,
 // otherwise returns NULL. Used to restrict methods that access suggestions and
 // most visited data to pages with origin chrome-search://most-visited and
@@ skipping 1035 matching lines @@
     return v8::Undefined();
   DVLOG(1) << render_view << " GetMostVisitedItems";
 
   const SearchBox* search_box = SearchBox::Get(render_view);
 
   std::vector<InstantMostVisitedItemIDPair> instant_mv_items;
   search_box->GetMostVisitedItems(&instant_mv_items);
   v8::Handle<v8::Array> v8_mv_items = v8::Array::New(instant_mv_items.size());
   for (size_t i = 0; i < instant_mv_items.size(); ++i) {
     v8_mv_items->Set(i, GenerateMostVisitedItem(instant_mv_items[i].first,
-                                                instant_mv_items[i].second));
+                                                instant_mv_items[i].second,
+                                                false));
   }
   return v8_mv_items;
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::DeleteMostVisitedItem(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view || !args.Length()) return v8::Undefined();
 
@@ skipping 127 matching lines @@
   if (args.Length() < 1 || !args[0]->IsNumber())
     return v8::Undefined();
 
   DVLOG(1) << render_view << " GetMostVisitedItem";
   InstantRestrictedID restricted_id = args[0]->IntegerValue();
   InstantMostVisitedItem mv_item;
   if (!SearchBox::Get(render_view)->GetMostVisitedItemWithID(
           restricted_id, &mv_item)) {
     return v8::Undefined();
   }
-  return GenerateMostVisitedItem(restricted_id, mv_item);
+  return GenerateMostVisitedItem(restricted_id, mv_item, true);
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::IsFocused(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
 
   bool is_focused = SearchBox::Get(render_view)->is_focused();
   DVLOG(1) << render_view << " IsFocused: " << is_focused;
@@ skipping 69 matching lines @@
 void SearchBoxExtension::DispatchBarsHidden(WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchBarsHiddenEventScript);
 }
 
 // static
 void SearchBoxExtension::DispatchFocusChange(WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchFocusChangedScript);
 }
 
 }  // namespace extensions_v8