Instant cleanup: remove MODE_SEARCH_RESULTS and ORIGIN_SEARCH

chrome/browser/ui/browser_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/browser_instant_controller.h"
 
 #include "base/bind.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
@@ skipping 85 matching lines @@
 }
 
 BrowserInstantController::~BrowserInstantController() {
   browser_->search_model()->RemoveObserver(this);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
   instant_service->RemoveObserver(this);
 }
 
-bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
+void BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
                                            const GURL& url) {
   // Unsupported dispositions.
   if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
       disposition == WindowOpenDisposition::NEW_WINDOW ||
-      disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
-    return false;
+      disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) {
+    return;
+  }
 
   // The omnibox currently doesn't use other dispositions, so we don't attempt
   // to handle them. If you hit this DCHECK file a bug and I'll (sky) add
   // support for the new disposition.
   DCHECK(disposition == WindowOpenDisposition::CURRENT_TAB)
       << static_cast<int>(disposition);
 
   const base::string16& search_terms =
       search::ExtractSearchTermsFromURL(profile(), url);
-  EmbeddedSearchRequestParams request_params(url);
   if (search_terms.empty())
-    return false;
+    return;
 
   InstantSearchPrerenderer* prerenderer =
       GetInstantSearchPrerenderer(profile());
-  if (prerenderer) {
-    if (prerenderer->CanCommitQuery(GetActiveWebContents(), search_terms)) {
-      // Submit query to render the prefetched results. Browser will swap the
-      // prerendered contents with the active tab contents.
-      prerenderer->Commit(search_terms, request_params);
-      return false;
-    } else {
-      prerenderer->Cancel();
-    }
+  if (!prerenderer)
+    return;
+
+  if (prerenderer->CanCommitQuery(GetActiveWebContents(), search_terms)) {
+    // Submit query to render the prefetched results. Browser will swap the
+    // prerendered contents with the active tab contents.
+    prerenderer->Commit(search_terms, EmbeddedSearchRequestParams(url));
+  } else {
+    prerenderer->Cancel();
   }
-
-  // If we will not be replacing search terms from this URL, don't send to
-  // InstantController.
-  if (!search::IsQueryExtractionAllowedForURL(profile(), url))
-    return false;
-  return instant_.SubmitQuery(search_terms, request_params);
 }
 
 Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
 content::WebContents* BrowserInstantController::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
@@ skipping 10 matching lines @@
 
 void BrowserInstantController::ModelChanged(
     const SearchModel::State& old_state,
     const SearchModel::State& new_state) {
   if (old_state.mode != new_state.mode) {
     const SearchMode& new_mode = new_state.mode;
 
     // Record some actions corresponding to the mode change. Note that to get
     // the full story, it's necessary to look at other UMA actions as well,
     // such as tab switches.
-    if (new_mode.is_search_results())
-      content::RecordAction(base::UserMetricsAction("InstantExtended.ShowSRP"));
-    else if (new_mode.is_ntp())
+    if (new_mode.is_ntp())
       content::RecordAction(base::UserMetricsAction("InstantExtended.ShowNTP"));
 
     instant_.SearchModeChanged(old_state.mode, new_mode);
   }
 
   if (old_state.instant_support != new_state.instant_support)
     instant_.InstantSupportChanged(new_state.instant_support);
 }
 
 void BrowserInstantController::DefaultSearchProviderChanged(
@@ skipping 26 matching lines @@
       params.referrer = content::Referrer();
       params.transition_type = ui::PAGE_TRANSITION_RELOAD;
       contents->GetController().LoadURLWithParams(params);
     } else {
       // Reload the contents to ensure that it gets assigned to a
       // non-privileged renderer.
       TabReloader::Reload(contents);
     }
   }
 }