Move most visited item state info from InstantController to InstantService.

chrome/renderer/searchbox/searchbox.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.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/omnibox_focus_state.h"
@@ skipping 108 matching lines @@
                               content::PageTransition transition,
                               WindowOpenDisposition disposition) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxNavigate(
       render_view()->GetRoutingID(), render_view()->GetPageId(),
       url, transition, disposition));
 }
 
 void SearchBox::DeleteMostVisitedItem(
     InstantRestrictedID most_visited_item_id) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
-      render_view()->GetRoutingID(), most_visited_item_id));
+      render_view()->GetRoutingID(),
+      GetURLForMostVisitedItem(most_visited_item_id)));
 }
 
 void SearchBox::UndoMostVisitedDeletion(
     InstantRestrictedID most_visited_item_id) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
-      render_view()->GetRoutingID(), most_visited_item_id));
+      render_view()->GetRoutingID(),
+      GetURLForMostVisitedItem(most_visited_item_id)));
 }
 
 void SearchBox::UndoAllMostVisitedDeletions() {
   render_view()->Send(
       new ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
       render_view()->GetRoutingID()));
 }
 
 void SearchBox::ShowBars() {
   DVLOG(1) << render_view() << " ShowBars";
@@ skipping 289 matching lines @@
     std::vector<InstantMostVisitedItemIDPair>* items) const {
   return most_visited_items_cache_.GetCurrentItems(items);
 }
 
 bool SearchBox::GetMostVisitedItemWithID(
     InstantRestrictedID most_visited_item_id,
     InstantMostVisitedItem* item) const {
   return most_visited_items_cache_.GetItemWithRestrictedID(most_visited_item_id,
                                                            item);
 }
+
+GURL SearchBox::GetURLForMostVisitedItem(InstantRestrictedID item_id) const {
+  InstantMostVisitedItem item;
+  return GetMostVisitedItemWithID(item_id, &item) ? item.url : GURL();
+}