Move most visited item state info from InstantController to InstantService.

chrome/browser/ui/search/instant_page.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/page_transition_types.h"
 
 class GURL;
 
 namespace content {
 struct FrameNavigateParams;
@@ skipping 59 matching lines @@
     // page to navigate to privileged destinations (e.g. chrome:// URLs) or to
     // navigate to URLs that are hidden from the page using Restricted IDs (rid
     // in the API).
     virtual void NavigateToURL(const content::WebContents* contents,
                                const GURL& url,
                                content::PageTransition transition,
                                WindowOpenDisposition disposition,
                                bool is_search_type) = 0;
 
     // Called when the SearchBox wants to delete a Most Visited item.
-    virtual void DeleteMostVisitedItem(
-        InstantRestrictedID most_visited_item_id) = 0;
+    virtual void DeleteMostVisitedItem(const GURL& url) = 0;
 
     // Called when the SearchBox wants to undo a Most Visited deletion.
-    virtual void UndoMostVisitedDeletion(
-        InstantRestrictedID most_visited_item_id) = 0;
+    virtual void UndoMostVisitedDeletion(const GURL& url) = 0;
 
     // Called when the SearchBox wants to undo all Most Visited deletions.
     virtual void UndoAllMostVisitedDeletions() = 0;
 
     // Called when the page fails to load for whatever reason.
     virtual void InstantPageLoadFailed(content::WebContents* contents) = 0;
 
    protected:
     virtual ~Delegate();
   };
@@ skipping 104 matching lines @@
   // methods.
   virtual bool ShouldProcessRenderViewCreated();
   virtual bool ShouldProcessRenderViewGone();
   virtual bool ShouldProcessAboutToNavigateMainFrame();
   virtual bool ShouldProcessSetSuggestions();
   virtual bool ShouldProcessShowInstantOverlay();
   virtual bool ShouldProcessFocusOmnibox();
   virtual bool ShouldProcessNavigateToURL();
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
+                           DispatchRequestToDeleteMostVisitedItem);
+  FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
+                           DispatchRequestToUndoMostVisitedDeletion);
+  FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
+                           DispatchRequestToUndoAllMostVisitedDeletions);
+
   // Overridden from content::WebContentsObserver:
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFinishLoad(
       int64 frame_id,
       const GURL& validated_url,
       bool is_main_frame,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
@@ skipping 19 matching lines @@
   void OnInstantSupportDetermined(int page_id, bool supports_instant);
   void OnShowInstantOverlay(int page_id,
                             int height,
                             InstantSizeUnits units);
   void OnFocusOmnibox(int page_id, OmniboxFocusState state);
   void OnSearchBoxNavigate(int page_id,
                            const GURL& url,
                            content::PageTransition transition,
                            WindowOpenDisposition disposition,
                            bool is_search_type);
-  void OnDeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
-  void OnUndoMostVisitedDeletion(InstantRestrictedID most_visited_item_id);
+  void OnDeleteMostVisitedItem(const GURL& url);
+  void OnUndoMostVisitedDeletion(const GURL& url);
   void OnUndoAllMostVisitedDeletions();
 
   Delegate* const delegate_;
   const std::string instant_url_;
   bool supports_instant_;
   bool instant_support_determined_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_