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

chrome/browser/ui/webui/ntp/thumbnail_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/ntp/thumbnail_source.h"
 
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
 }
 
 ThumbnailSource::~ThumbnailSource() {
 }
 
 std::string ThumbnailSource::GetSource() const {
   return chrome::kChromeUIThumbnailHost;
 }
 
 void ThumbnailSource::StartDataRequest(
-    const std::string& raw_path,
+    const std::string& path,
     int render_process_id,
     int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
-  // Translate to regular path if |raw_path| is of the form
-  // chrome-search://favicon/<id> or chrome-search://thumb/<id>, where <id> is
-  // an integer.
-  std::string path = raw_path;
-  if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    std::map<std::string, std::string>::iterator it =
-        id_to_url_map_.find(raw_path);
-    if (it != id_to_url_map_.end()) {
-      path = id_to_url_map_[raw_path];
-      id_to_url_map_.erase(it);
-    }
-  } else if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    path = InstantService::MaybeTranslateInstantPathOnUI(profile_, raw_path);
-  }
-
   scoped_refptr<base::RefCountedMemory> data;
   if (thumbnail_service_->GetPageThumbnail(GURL(path), &data)) {
     // We have the thumbnail.
     callback.Run(data.get());
   } else {
     callback.Run(default_thumbnail_.get());
   }
 }
 
 std::string ThumbnailSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 base::MessageLoop* ThumbnailSource::MessageLoopForRequestPath(
     const std::string& path) const {
   // TopSites can be accessed from the IO thread.
   return thumbnail_service_.get() ?
       NULL : content::URLDataSource::MessageLoopForRequestPath(path);
 }
 
 bool ThumbnailSource::ShouldServiceRequest(
     const net::URLRequest* request) const {
-  if (request->url().SchemeIs(chrome::kChromeSearchScheme)) {
-    if (InstantService::IsInstantPath(request->url()) &&
-        InstantIOContext::ShouldServiceRequest(request)) {
-      // If this request will be serviced on the IO thread, then do the
-      // translation from raw_path to path here, where we have the |request|
-      // object in-hand, saving the result for later use.
-
-      // Strip leading slash from path.
-      std::string raw_path = request->url().path().substr(1);
-      if (!MessageLoopForRequestPath(raw_path)) {
-        id_to_url_map_[raw_path] =
-            InstantService::MaybeTranslateInstantPathOnIO(request, raw_path);
-      }
-      return true;
-    }
-    return false;
-  }
+  if (request->url().SchemeIs(chrome::kChromeSearchScheme))
+    return InstantIOContext::ShouldServiceRequest(request);
   return URLDataSource::ShouldServiceRequest(request);
 }