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

chrome/browser/ui/webui/favicon_source.cc

 // Copyright (c) 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/browser/ui/webui/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
@@ skipping 64 matching lines @@
 
 FaviconSource::~FaviconSource() {
 }
 
 std::string FaviconSource::GetSource() const {
   return icon_types_ == chrome::FAVICON ?
       chrome::kChromeUIFaviconHost : chrome::kChromeUITouchIconHost;
 }
 
 void FaviconSource::StartDataRequest(
-    const std::string& raw_path,
+    const std::string& path,
     int render_process_id,
     int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service) {
     SendDefaultResponse(callback);
     return;
   }
 
   bool is_icon_url = false;
   GURL url;
   int size_in_dip = 16;
   ui::ScaleFactor scale_factor = ui::SCALE_FACTOR_100P;
-  bool success = ParsePath(raw_path, &is_icon_url, &url, &size_in_dip,
+  bool success = ParsePath(path, &is_icon_url, &url, &size_in_dip,
       &scale_factor);
 
   if (!success) {
     SendDefaultResponse(callback);
     return;
   }
 
   if (is_icon_url) {
     // TODO(michaelbai): Change GetRawFavicon to support combination of
     // IconType.
@@ skipping 42 matching lines @@
   return "image/png";
 }
 
 bool FaviconSource::ShouldReplaceExistingSource() const {
   // Leave the existing DataSource in place, otherwise we'll drop any pending
   // requests on the floor.
   return false;
 }
 
 bool FaviconSource::ShouldServiceRequest(const net::URLRequest* request) const {
-  if (request->url().SchemeIs(chrome::kChromeSearchScheme)) {
-    return InstantService::IsInstantPath(request->url()) &&
-        InstantIOContext::ShouldServiceRequest(request);
-  }
+  if (request->url().SchemeIs(chrome::kChromeSearchScheme))
+    return InstantIOContext::ShouldServiceRequest(request);
   return URLDataSource::ShouldServiceRequest(request);
 }
 
 bool FaviconSource::HandleMissingResource(const IconRequest& request) {
   // No additional checks to locate the favicon resource in the base
   // implementation.
   return false;
 }
 
-bool FaviconSource::ParsePath(const std::string& raw_path,
+bool FaviconSource::ParsePath(const std::string& path,
                               bool* is_icon_url,
                               GURL* url,
                               int* size_in_dip,
                               ui::ScaleFactor* scale_factor) const {
   DCHECK_EQ(16, gfx::kFaviconSize);
 
   *is_icon_url = false;
   *url = GURL();
   *size_in_dip = 16;
   *scale_factor = ui::SCALE_FACTOR_100P;
 
-  if (raw_path.empty())
+  if (path.empty())
     return false;
 
-  // Translate to regular path if |raw_path| is of the form
-  // chrome-search://favicon/<most_visited_item_id>, where
-  // "most_visited_item_id" is a uint64.
-  std::string path = InstantService::MaybeTranslateInstantPathOnUI(profile_,
-                                                                   raw_path);
   size_t parsed_index = 0;
   if (HasSubstringAt(path, parsed_index, kLargestParameter)) {
     parsed_index += strlen(kLargestParameter);
     *size_in_dip = 0;
   } else if (HasSubstringAt(path, parsed_index, kSizeParameter)) {
     parsed_index += strlen(kSizeParameter);
 
     size_t slash = path.find("/", parsed_index);
     if (slash == std::string::npos)
       return false;
 
     size_t scale_delimiter = path.find("@", parsed_index);
     std::string size_str;
     std::string scale_str;
     if (scale_delimiter == std::string::npos) {
       // Support the legacy size format of 'size/aa/' where 'aa' is the desired
       // size in DIP for the sake of not regressing the extensions which use it.
       size_str = path.substr(parsed_index, slash - parsed_index);
     } else {
       size_str = path.substr(parsed_index, scale_delimiter - parsed_index);
-      scale_str = path.substr(scale_delimiter + 1,
-                              slash - scale_delimiter - 1);
+      scale_str = path.substr(scale_delimiter + 1, slash - scale_delimiter - 1);
     }
 
     if (!base::StringToInt(size_str, size_in_dip))
       return false;
 
     if (*size_in_dip != 64 && *size_in_dip != 32) {
       // Only 64x64, 32x32 and 16x16 icons are supported.
       *size_in_dip = 16;
     }
 
@@ skipping 77 matching lines @@
 
   if (!default_favicon) {
     ui::ScaleFactor scale_factor = icon_request.scale_factor;
     default_favicon = ResourceBundle::GetSharedInstance()
         .LoadDataResourceBytesForScale(resource_id, scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
   icon_request.callback.Run(default_favicon);
 }