[Search] No longer reverting omnibox text on instant search

chrome/browser/ui/toolbar/toolbar_model_impl.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/toolbar/toolbar_model_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 20 matching lines @@
       input_in_progress_(false) {
 }
 
 ToolbarModelImpl::~ToolbarModelImpl() {
 }
 
 // ToolbarModelImpl Implementation.
 string16 ToolbarModelImpl::GetText(
     bool display_search_urls_as_search_terms) const {
   if (display_search_urls_as_search_terms) {
-    string16 search_terms = TryToExtractSearchTermsFromURL();
+    const NavigationController* navigation_controller =
+        GetNavigationController();
+    if (navigation_controller) {
+      NavigationEntry* entry = NULL;
+      entry = navigation_controller->GetActiveEntry();
+      if (entry && !entry->GetSearchTerms().empty()) {
+        // Entry has existing search terms.
+        return entry->GetSearchTerms();
+      }
+    }
+    string16 search_terms = TryToExtractSearchTermsFromCurrentURL();
     if (!search_terms.empty())
       return search_terms;
   }
   std::string languages;  // Empty if we don't have a |navigation_controller|.
   Profile* profile = GetProfile();
   if (profile)
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
 
   GURL url(GetURL());
   if (url.spec().length() > content::kMaxURLDisplayChars)
@@ skipping 11 matching lines @@
   if (navigation_controller) {
     const NavigationEntry* entry = navigation_controller->GetVisibleEntry();
     if (entry)
       return ShouldDisplayURL() ? entry->GetVirtualURL() : GURL();
   }
 
   return GURL(chrome::kAboutBlankURL);
 }
 
 bool ToolbarModelImpl::WouldReplaceSearchURLWithSearchTerms() const {
-  return !TryToExtractSearchTermsFromURL().empty();
+  return !TryToExtractSearchTermsFromCurrentURL().empty();
+}
+
+string16 ToolbarModelImpl::TryToExtractSearchTermsFromCurrentURL() const {
+  const GURL& url = GetURL();
+  Profile* profile = GetProfile();
+  if (!profile)
+    return string16();
+  TemplateURLService* template_url_service =
+        TemplateURLServiceFactory::GetForProfile(profile);
+  return template_url_service->TryToExtractSearchTermsFromURL(url);
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   // Note: The order here is important.
   // - The WebUI test must come before the extension scheme test because there
   //   can be WebUIs that have extension schemes (e.g. the bookmark manager). In
   //   that case, we should prefer what the WebUI instance says.
   // - The view-source test must come before the WebUI test because of the case
   //   of view-source:chrome://newtab, which should display its URL despite what
   //   chrome://newtab's WebUI says.
@@ skipping 108 matching lines @@
 }
 
 NavigationController* ToolbarModelImpl::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   WebContents* current_tab = delegate_->GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : NULL;
 }
 
-string16 ToolbarModelImpl::TryToExtractSearchTermsFromURL() const {
-  const GURL& url = GetURL();
-  Profile* profile = GetProfile();
-
-  // Ensure instant extended API is enabled and query URL is HTTPS.
-  if (!profile || !chrome::search::IsInstantExtendedAPIEnabled(profile) ||
-      !url.SchemeIs(chrome::kHttpsScheme) ||
-      !google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()))
-    return string16();
-
-  TemplateURLService* template_url_service =
-      TemplateURLServiceFactory::GetForProfile(profile);
-
-  TemplateURL *template_url = template_url_service->GetDefaultSearchProvider();
-  if (!template_url)
-    return string16();
-
-  string16 result;
-  template_url->ExtractSearchTermsFromURL(url, &result);
-  return result;
-}
-
 Profile* ToolbarModelImpl::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
   return navigation_controller ?
       Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
       NULL;
 }