Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/browser/ui/toolbar/toolbar_model.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/ui/toolbar/toolbar_model.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_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"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 169 matching lines @@
 NavigationController* ToolbarModel::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 ToolbarModel::TryToExtractSearchTermsFromURL(const GURL& url) const {
   Profile* profile = GetProfile();
-  if (profile &&
-      chrome::search::IsInstantExtendedAPIEnabled(profile) &&
-      google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec())) {
-    // TODO(dominich): http://crbug.com/135106 - Replace this with whatever the
-    // final solution is as per http://crbug.com/139176.
-    return google_util::GetSearchTermsFromGoogleSearchURL(url.spec());
-  }
-  return string16();
+
+  if (!profile || !chrome::search::IsInstantExtendedAPIEnabled(profile))

[dominich, 2012/09/14 21:34:04]

One more thought (from a discussion with dcblack): We should only do the
replacement if the navigation entry page transition is typed (or maybe reload).
User interaction is a necessary requirement.

[beaudoin, 2012/09/22 06:55:45]

From the discussion it looks like we should only replace on GENERATED
transitions, but I don't know how/where to check for that. Pointers appreciated.

+    return string16();
+
+  TemplateURLService* template_url_service =
+      TemplateURLServiceFactory::GetForProfile(profile);
+
+  if (!template_url_service)
+    return string16();
+
+  TemplateURL *template_url = template_url_service->GetDefaultSearchProvider();
+  if (!template_url)
+    return string16();
+
+  return template_url->ExtractSearchTermsFromURL(url);

[dominich, 2012/09/13 18:30:30]

is this checking for espv=1 in the query component? That's what the
IsInstantExtendedAPIGoogleSearchUrl did.

[beaudoin, 2012/09/22 06:55:45]

Done.

 }
 
 Profile* ToolbarModel::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
   return navigation_controller ?
       Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
       NULL;
 }