A simple version of search term replacement for testing .

chrome/browser/ui/toolbar/toolbar_model.cc

Index: chrome/browser/ui/toolbar/toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc
index 02f27f3d328dbe107dde778c091344083d352d50..c7a164686d0c41e4488dbc116da6034ec47c45cb 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model.cc
@@ -6,9 +6,11 @@
 
 #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/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"
@@ -40,22 +42,19 @@ ToolbarModel::~ToolbarModel() {
 }
 
 // ToolbarModel Implementation.
-string16 ToolbarModel::GetText() const {
-  GURL url(chrome::kAboutBlankURL);
-  std::string languages;  // Empty if we don't have a |navigation_controller|.
+string16 ToolbarModel::GetText(bool display_search_urls_as_search_terms) const {
+  GURL url(GetURL());
 
-  NavigationController* navigation_controller = GetNavigationController();
-  if (navigation_controller) {
-    Profile* profile =
-        Profile::FromBrowserContext(navigation_controller->GetBrowserContext());
-    languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
-    NavigationEntry* entry = navigation_controller->GetVisibleEntry();
-    if (!ShouldDisplayURL()) {
-      url = GURL();
-    } else if (entry) {
-      url = entry->GetVirtualURL();
-    }
+  if (display_search_urls_as_search_terms) {
+    string16 search_terms = TryToExtractSearchTermsFromURL(url);
+    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);
+
   if (url.spec().length() > content::kMaxURLDisplayChars)
     url = url.IsStandard() ? url.GetOrigin() : GURL(url.scheme() + ":");
   // Note that we can't unescape spaces here, because if the user copies this
@@ -66,6 +65,21 @@ string16 ToolbarModel::GetText() const {
                           net::UnescapeRule::NORMAL, NULL, NULL, NULL));
 }
 
+GURL ToolbarModel::GetURL() const {
+  const NavigationController* navigation_controller = GetNavigationController();
+  if (navigation_controller) {
+    const NavigationEntry* entry = navigation_controller->GetVisibleEntry();
+    if (entry)
+      return ShouldDisplayURL() ? entry->GetVirtualURL() : GURL();
+  }
+
+  return GURL(chrome::kAboutBlankURL);
+}
+
+bool ToolbarModel::WouldReplaceSearchURLWithSearchTerms() const {
+  return !TryToExtractSearchTermsFromURL(GetURL()).empty();
+}
+
 bool ToolbarModel::ShouldDisplayURL() const {
   // Note: The order here is important.
   // - The WebUI test must come before the extension scheme test because there
@@ -181,3 +195,22 @@ NavigationController* ToolbarModel::GetNavigationController() const {
   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())) {

[sky, 2012/08/23 22:44:26]

Shouldn't this always be with the default search provider?

[dominich, 2012/08/24 15:51:07]

Eventually, yes. See the bugs referenced in the CL for more details.

For now, restricting it to a specific URL helps us test the idea and
implementation.

[sky, 2012/08/24 18:11:03]

Fair enough. Shouldn't you only do this if default search provider is google
though?

+    // 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();
+}
+
+Profile* ToolbarModel::GetProfile() const {
+  NavigationController* navigation_controller = GetNavigationController();
+  return navigation_controller ?
+      Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
+      NULL;
+}