Instant cleanup: remove MODE_SEARCH_RESULTS and ORIGIN_SEARCH

chrome/browser/ui/search/instant_controller.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/browser/ui/search/instant_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_controller.h"

[Peter Kasting, 2016/09/02 20:40:59]

I think this #include is dead.  Please check all other #includes as well.

[Marc Treib, 2016/09/05 12:11:16]

Done.

 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace {
 
 bool IsContentsFrom(const InstantTab* page,
                     const content::WebContents* contents) {
   return page && (page->web_contents() == contents);
 }
 
-// Adds a transient NavigationEntry to the supplied |contents|'s
-// NavigationController if the page's URL has not already been updated with the
-// supplied |search_terms|.
-// TODO(treib): Is it safe to completely remove this? crbug.com/627747
-void EnsureSearchTermsAreSet(content::WebContents* contents,
-                             const base::string16& search_terms) {
-  content::NavigationController* controller = &contents->GetController();
-
-  // If search terms are already correct or there is already a transient entry
-  // (there shouldn't be), bail out early.
-  if (search_terms.empty() || controller->GetTransientEntry())
-    return;
-
-  const content::NavigationEntry* entry = controller->GetLastCommittedEntry();
-  std::unique_ptr<content::NavigationEntry> transient =
-      controller->CreateNavigationEntry(
-          entry->GetURL(), entry->GetReferrer(), entry->GetTransitionType(),
-          false, std::string(), contents->GetBrowserContext());
-  controller->SetTransientEntry(std::move(transient));
-
-  SearchTabHelper::FromWebContents(contents)->NavigationEntryUpdated();
-}
-
 }  // namespace
 
 InstantController::InstantController(BrowserInstantController* browser)
     : browser_(browser) {
 }
 
 InstantController::~InstantController() {
 }
 
-bool InstantController::SubmitQuery(const base::string16& search_terms,
-                                    const EmbeddedSearchRequestParams& params) {
-  if (!instant_tab_ || !instant_tab_->web_contents())
-    return false;
-
-  SearchTabHelper* search_tab =
-      SearchTabHelper::FromWebContents(instant_tab_->web_contents());
-  if (!search_tab->SupportsInstant() || !search_mode_.is_origin_search())
-    return false;
-
-  // Use |instant_tab_| to run the query if we're already on a search results
-  // page. (NOTE: in particular, we do not send the query to NTPs.)
-  search_tab->Submit(search_terms, params);
-  instant_tab_->web_contents()->Focus();
-  EnsureSearchTermsAreSet(instant_tab_->web_contents(), search_terms);
-  return true;
-}
-
 void InstantController::SearchModeChanged(const SearchMode& old_mode,
                                           const SearchMode& new_mode) {
   LogDebugEvent(base::StringPrintf(
       "SearchModeChanged: [origin:mode] %d:%d to %d:%d", old_mode.origin,
       old_mode.mode, new_mode.origin, new_mode.mode));
 
   search_mode_ = new_mode;
   ResetInstantTab();
 }
 
@@ skipping 72 matching lines @@
     if (instant_service) {
       instant_service->UpdateThemeInfo();
       instant_service->UpdateMostVisitedItemsInfo();
     }
   }
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(browser_->profile());
 }