Move most visited item state info from InstantController to InstantService.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/14660022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203821 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 2 deletions

diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
index ef1f6ab..4aa93c3 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -98,13 +98,15 @@ void SearchBox::NavigateToURL(const GURL& url,
 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() {
@@ -423,3 +425,8 @@ bool SearchBox::GetMostVisitedItemWithID(
   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();
+}
diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h
index dd1c683..ec58f40 100644
--- a/chrome/renderer/searchbox/searchbox.h
+++ b/chrome/renderer/searchbox/searchbox.h
@@ -155,6 +155,9 @@ class SearchBox : public content::RenderViewObserver,
   // Sets the query to a new value.
   void SetQuery(const string16& query, bool verbatim);
 
+  // Returns the URL of the Most Visited item specified by the |item_id|.
+  GURL GetURLForMostVisitedItem(InstantRestrictedID item_id) const;
+
   string16 query_;
   bool verbatim_;
   bool query_is_restricted_;