Remove DetermineIfPageSupportsInstant and all its plumbing

chrome/browser/ui/search/search_ipc_router.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_SEARCH_IPC_ROUTER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "chrome/common/instant.mojom.h"
 #include "chrome/common/search/instant_types.h"
 #include "chrome/common/search/ntp_logging_events.h"
 #include "components/ntp_tiles/tile_source.h"
 #include "components/ntp_tiles/tile_visual_type.h"
 #include "components/omnibox/common/omnibox_focus_state.h"
 #include "content/public/browser/web_contents_binding_set.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "ui/base/window_open_disposition.h"
 
 class GURL;
 
 namespace content {
 class WebContents;
 }
 
 class SearchIPCRouterTest;
 
 // SearchIPCRouter is responsible for receiving and sending IPC messages between
 // the browser and the Instant page.
 class SearchIPCRouter : public content::WebContentsObserver,
                         public chrome::mojom::Instant {
  public:
   // SearchIPCRouter calls its delegate in response to messages received from
   // the page.
   class Delegate {
    public:
     // Called upon determination of Instant API support in response to the page
     // load event.
+    // TODO(treib): Remove this. crbug.com/627747
     virtual void OnInstantSupportDetermined(bool supports_instant) = 0;
 
     // Called when the page wants the omnibox to be focused. |state| specifies
     // the omnibox focus state.
     virtual void FocusOmnibox(OmniboxFocusState state) = 0;
 
     // Called when the SearchBox wants to delete a Most Visited item.
     virtual void OnDeleteMostVisitedItem(const GURL& url) = 0;
 
     // Called when the SearchBox wants to undo a Most Visited deletion.
@@ skipping 76 matching lines @@
   };
 
   SearchIPCRouter(content::WebContents* web_contents,
                   Delegate* delegate,
                   std::unique_ptr<Policy> policy);
   ~SearchIPCRouter() override;
 
   // Tells the SearchIPCRouter that a new page in an Instant process committed.
   void OnNavigationEntryCommitted();
 
-  // Tells the renderer to determine if the page supports the Instant API, which
-  // results in a call to OnInstantSupportDetermined() when the reply is
-  // received.
-  void DetermineIfPageSupportsInstant();
-
   // Tells the renderer about the result of the Chrome identity check.
   void SendChromeIdentityCheckResult(const base::string16& identity,
                                      bool identity_match);
 
   // Tells the renderer whether the user syncs history.
   void SendHistorySyncCheckResult(bool sync_history);
 
   // Tells the page the suggestion to be prefetched if any.
   void SetSuggestionToPrefetch(const InstantSuggestion& suggestion);
 
@@ skipping 14 matching lines @@
   void Submit(const base::string16& text,
               const EmbeddedSearchRequestParams& params);
 
   // Called when the tab corresponding to |this| instance is activated.
   void OnTabActivated();
 
   // Called when the tab corresponding to |this| instance is deactivated.
   void OnTabDeactivated();
 
   // chrome::mojom::Instant:
-  void InstantSupportDetermined(int page_seq_no,
-                                bool supports_instant) override;
   void FocusOmnibox(int page_id, OmniboxFocusState state) override;
   void DeleteMostVisitedItem(int page_seq_no, const GURL& url) override;
   void UndoMostVisitedDeletion(int page_seq_no, const GURL& url) override;
   void UndoAllMostVisitedDeletions(int page_seq_no) override;
   void LogEvent(int page_seq_no,
                 NTPLoggingEventType event,
                 base::TimeDelta time) override;
   void LogMostVisitedImpression(int page_seq_no,
                                 int position,
                                 ntp_tiles::TileSource tile_source,
@@ skipping 10 matching lines @@
 
   void set_search_box_client_factory_for_testing(
       std::unique_ptr<SearchBoxClientFactory> factory) {
     search_box_client_factory_ = std::move(factory);
   }
 
  private:
   friend class SearchIPCRouterPolicyTest;
   friend class SearchIPCRouterTest;
   FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
-                           DetermineIfPageSupportsInstant_Local);
-  FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
-                           DetermineIfPageSupportsInstant_NonLocal);
-  FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
                            PageURLDoesntBelongToInstantRenderer);
   FRIEND_TEST_ALL_PREFIXES(SearchIPCRouterTest,
                            IgnoreMessageIfThePageIsNotActive);
   FRIEND_TEST_ALL_PREFIXES(SearchIPCRouterTest, HandleTabChangedEvents);
 
   // Used by unit tests to set a fake delegate.
   void set_delegate_for_testing(Delegate* delegate);
 
   // Used by unit tests.
   void set_policy_for_testing(std::unique_ptr<Policy> policy);
@@ skipping 22 matching lines @@
   // the moment, but this could be extended to a map of connected frames, if
   // desired.
   mojo::AssociatedBinding<chrome::mojom::Instant> binding_;
 
   std::unique_ptr<SearchBoxClientFactory> search_box_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchIPCRouter);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_