Most visited thumbnails and favicons need id-based urls

chrome/browser/instant/instant_page.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/instant/instant_page.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 77 matching lines @@
   Send(new ChromeViewMsg_SearchBoxSetDisplayInstantResults(
       routing_id(), display_instant_results));
 }
 
 void InstantPage::KeyCaptureChanged(bool is_key_capture_enabled) {
   Send(new ChromeViewMsg_SearchBoxKeyCaptureChanged(
       routing_id(), is_key_capture_enabled));
 }
 
 void InstantPage::SendMostVisitedItems(
-    const std::vector<MostVisitedItem>& items) {
-  Send(new ChromeViewMsg_InstantMostVisitedItemsChanged(routing_id(), items));
+    const std::vector<InstantMostVisitedItem>& items) {
+  Send(new ChromeViewMsg_SearchBoxMostVisitedItemsChanged(routing_id(), items));
 }
 
 InstantPage::InstantPage(Delegate* delegate)
     : delegate_(delegate),
       supports_instant_(false) {
 }
 
 void InstantPage::SetContents(content::WebContents* contents) {
   Observe(contents);
 }
@@ skipping 56 matching lines @@
                         OnInstantSupportDetermined)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowInstantOverlay,
                         OnShowInstantOverlay)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FocusOmnibox, OnFocusOmnibox)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_StartCapturingKeyStrokes,
                         OnStartCapturingKeyStrokes);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_StopCapturingKeyStrokes,
                         OnStopCapturingKeyStrokes);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxNavigate,
                         OnSearchBoxNavigate);
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantDeleteMostVisitedItem,
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem,
                         OnDeleteMostVisitedItem);
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantUndoMostVisitedDeletion,
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion,
                         OnUndoMostVisitedDeletion);
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantUndoAllMostVisitedDeletions,
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions,
                         OnUndoAllMostVisitedDeletions);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void InstantPage::RenderViewGone(base::TerminationStatus /* status */) {
   if (ShouldProcessRenderViewGone())
     delegate_->InstantPageRenderViewGone(contents());
 }
@@ skipping 72 matching lines @@
                                       const GURL& url,
                                       content::PageTransition transition,
                                       WindowOpenDisposition disposition) {
   if (contents()->IsActiveEntry(page_id)) {
     OnInstantSupportDetermined(page_id, true);
     if (ShouldProcessNavigateToURL())
       delegate_->NavigateToURL(contents(), url, transition, disposition);
   }
 }
 
-void InstantPage::OnDeleteMostVisitedItem(const GURL& url) {
-  delegate_->DeleteMostVisitedItem(url);
+void InstantPage::OnDeleteMostVisitedItem(uint64 restricted_id) {
+  delegate_->DeleteMostVisitedItem(restricted_id);
 }
 
-void InstantPage::OnUndoMostVisitedDeletion(const GURL& url) {
-  delegate_->UndoMostVisitedDeletion(url);
+void InstantPage::OnUndoMostVisitedDeletion(uint64 restricted_id) {
+  delegate_->UndoMostVisitedDeletion(restricted_id);
 }
 
 void InstantPage::OnUndoAllMostVisitedDeletions() {
   delegate_->UndoAllMostVisitedDeletions();
 }