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

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/search/instant_service.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/local_ntp_source.h"
 #include "chrome/browser/search/most_visited_iframe_source.h"
+#include "chrome/browser/search/search.h"
 #include "chrome/browser/search/suggestion_iframe_source.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/search/instant_controller.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 
 InstantService::InstantService(Profile* profile)
     : profile_(profile),
-      most_visited_item_cache_(kMaxInstantMostVisitedItemCacheSize),
       weak_ptr_factory_(this) {
   // Stub for unit tests.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
     return;
 
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllSources());
 
   history::TopSites* top_sites = profile_->GetTopSites();
@@ skipping 19 matching lines @@
   content::URLDataSource::Add(profile, new FaviconSource(
       profile, FaviconSource::FAVICON));
   content::URLDataSource::Add(profile, new LocalNtpSource());
   content::URLDataSource::Add(profile, new SuggestionIframeSource());
   content::URLDataSource::Add(profile, new MostVisitedIframeSource());
 }
 
 InstantService::~InstantService() {
 }
 
-// static
-const std::string InstantService::MaybeTranslateInstantPathOnUI(
-    Profile* profile, const std::string& path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  InstantService* instant_service =
-      InstantServiceFactory::GetForProfile(profile);
-  if (!instant_service)
-    return path;
-
-  InstantRestrictedID restricted_id = 0;
-  DCHECK_EQ(sizeof(InstantRestrictedID), sizeof(int));
-  if (base::StringToInt(path, &restricted_id)) {
-    InstantMostVisitedItem item;
-    if (instant_service->GetMostVisitedItemForID(restricted_id, &item))
-      return item.url.spec();
-  }
-  return path;
-}
-
-const std::string InstantService::MaybeTranslateInstantPathOnIO(
-    const net::URLRequest* request, const std::string& path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  InstantRestrictedID restricted_id = 0;
-  DCHECK_EQ(sizeof(InstantRestrictedID), sizeof(int));
-  if (base::StringToInt(path, &restricted_id)) {
-    GURL url;
-    if (InstantIOContext::GetURLForMostVisitedItemID(request,
-                                                     restricted_id,
-                                                     &url)) {
-      return url.spec();
-    }
-  }
-  return path;
-}
-
-// static
-bool InstantService::IsInstantPath(const GURL& url) {
-  // Strip leading slash.
-  std::string path = url.path().substr(1);
-
-  // Check that path is of Most Visited item ID form.
-  InstantRestrictedID dummy = 0;
-  return base::StringToInt(path, &dummy);
-}
-
 void InstantService::AddInstantProcess(int process_id) {
   process_ids_.insert(process_id);
 
   if (instant_io_context_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&InstantIOContext::AddInstantProcessOnIO,
                    instant_io_context_, process_id));
   }
 }
 
 bool InstantService::IsInstantProcess(int process_id) const {
   return process_ids_.find(process_id) != process_ids_.end();
 }
 
-void InstantService::AddMostVisitedItems(
-    const std::vector<InstantMostVisitedItem>& items) {
-  most_visited_item_cache_.AddItems(items);
-
-  // Post task to the IO thread to copy the data.
-  if (instant_io_context_) {
-    std::vector<InstantMostVisitedItemIDPair> items;
-    most_visited_item_cache_.GetCurrentItems(&items);
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&InstantIOContext::AddMostVisitedItemsOnIO,
-                   instant_io_context_,
-                   items));
-  }
-}
-
 void InstantService::DeleteMostVisitedItem(const GURL& url) {
   history::TopSites* top_sites = profile_->GetTopSites();
   if (!top_sites)
     return;
 
   top_sites->AddBlacklistedURL(url);
 }
 
 void InstantService::UndoMostVisitedDeletion(const GURL& url) {
   history::TopSites* top_sites = profile_->GetTopSites();
   if (!top_sites)
     return;
 
   top_sites->RemoveBlacklistedURL(url);
 }
 
 void InstantService::UndoAllMostVisitedDeletions() {
   history::TopSites* top_sites = profile_->GetTopSites();
   if (!top_sites)
     return;
 
   top_sites->ClearBlacklistedURLs();
 }
 
 void InstantService::GetCurrentMostVisitedItems(
-    std::vector<InstantMostVisitedItemIDPair>* items) const {
-  most_visited_item_cache_.GetCurrentItems(items);
+    std::vector<InstantMostVisitedItem>* items) const {
+  *items = most_visited_items_;
 }
 
 void InstantService::Shutdown() {
   process_ids_.clear();
 
   if (instant_io_context_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&InstantIOContext::ClearInstantProcessesOnIO,
                    instant_io_context_));
@@ skipping 25 matching lines @@
             base::Bind(&InstantService::OnMostVisitedItemsReceived,
                        weak_ptr_factory_.GetWeakPtr()));
       }
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
 }
 
-bool InstantService::GetMostVisitedItemForID(
-    InstantRestrictedID most_visited_item_id,
-    InstantMostVisitedItem* item) const {
-  return most_visited_item_cache_.GetItemWithRestrictedID(
-      most_visited_item_id, item);
-}
-
 void InstantService::OnMostVisitedItemsReceived(
     const history::MostVisitedURLList& data) {
   // Android doesn't use Browser/BrowserList. Do nothing for Android platform.
 #if !defined(OS_ANDROID)
   history::MostVisitedURLList reordered_data(data);
   history::TopSites::MaybeShuffle(&reordered_data);
 
   std::vector<InstantMostVisitedItem> most_visited_items;

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

Call this new_most_visited_items to make the distinction between it and
most_visited_items_ clearer.

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

Done.

   for (size_t i = 0; i < reordered_data.size(); i++) {
     const history::MostVisitedURL& url = reordered_data[i];
     InstantMostVisitedItem item;
     item.url = url.url;
     item.title = url.title;
     most_visited_items.push_back(item);
   }
-  AddMostVisitedItems(most_visited_items);
+  if (chrome::AreMostVisitedItemsEqual(most_visited_items,
+                                       most_visited_items_))
+    return;
+
+  most_visited_items_ = most_visited_items;
 
   const BrowserList* browser_list =
       BrowserList::GetInstance(chrome::GetActiveDesktop());
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end(); ++it) {
     if ((*it)->profile() != profile_ || !((*it)->instant_controller()))
       continue;
 
     InstantController* controller = (*it)->instant_controller()->instant();
     if (!controller)
       continue;
     controller->UpdateMostVisitedItems();
   }
 #endif
 }