[Search] No longer reverting omnibox text on instant search

chrome/browser/search_engines/template_url_service.cc

 // Copyright (c) 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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_setting_change.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/util.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_util.h"
@@ skipping 381 matching lines @@
           LessWithPrefix()));
 
   // Return vector of matching keywords.
   for (KeywordToTemplateMap::const_iterator i(match_range.first);
        i != match_range.second; ++i) {
     if (!support_replacement_only || i->second->url_ref().SupportsReplacement())
       matches->push_back(i->first);
   }
 }
 
+string16 TemplateURLService::TryToExtractSearchTermsFromURL(GURL url) {

[sky, 2012/12/12 22:41:57]

How about making this a function in chrome/browser/ui/search/search_utils ?

[Mathieu, 2012/12/12 23:37:24]

I thought it fit nicely here since it already used the template_url_service and
template_url and it is similar to other functions in this file. 

If you don't mind it's getting late Eastern time and I would like to check this
in today (dev cut tomorrow) if the rest seems reasonable to you. I propose to
have a follow-up CL tomorrow that will do just that.

[sky, 2012/12/13 00:48:18]

This uses public state of TemplateURLService. Its best to keep such functions
outside the class.

+  TemplateURL *template_url = GetDefaultSearchProvider();
+  if (!template_url)
+    return string16();
+
+  // Ensure instant extended API is enabled and query URL is HTTPS.
+  if (!template_url->profile_ ||

[sky, 2012/12/12 22:41:57]

Why are you using template_url->profile_ instead of profile_ ?

[Mathieu, 2012/12/12 23:37:24]

Done.

+      !chrome::search::IsInstantExtendedAPIEnabled(template_url->profile_) ||
+      !url.SchemeIs(chrome::kHttpsScheme) ||
+      !google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()))
+    return string16();
+
+  string16 result;
+  template_url->ExtractSearchTermsFromURL(url, &result);
+  return result;
+}
+
 TemplateURL* TemplateURLService::GetTemplateURLForKeyword(
     const string16& keyword) {
   KeywordToTemplateMap::const_iterator elem(
       keyword_to_template_map_.find(keyword));
   if (elem != keyword_to_template_map_.end())
     return elem->second;
   return ((!loaded_ || load_failed_) &&
       initial_default_search_provider_.get() &&
       (initial_default_search_provider_->keyword() == keyword)) ?
       initial_default_search_provider_.get() : NULL;
@@ skipping 2112 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }