[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"
@@ skipping 34 matching lines @@
 
 ToolbarModelImpl::~ToolbarModelImpl() {
 }
 
 // ToolbarModelImpl Implementation.
 string16 ToolbarModelImpl::GetText(
     bool display_search_urls_as_search_terms) const {
   GURL url(GetURL());
 
   if (display_search_urls_as_search_terms) {
+    NavigationEntry* entry;
+    const NavigationController* navigation_controller =
+        GetNavigationController();
+    if (navigation_controller) {
+      entry = navigation_controller->GetVisibleEntry();
+      if (entry && !entry->GetSearchTerms().empty()) {
+        // Entry has existing search terms.
+        return entry->GetSearchTerms();
+      }
+    }
     string16 search_terms = TryToExtractSearchTermsFromURL(url);
-    if (!search_terms.empty())
+    if (!search_terms.empty()) {
+      if (entry)

[akalin, 2012/12/05 19:40:27]

bug! entry isn't always initialized

[Mathieu, 2012/12/05 20:42:16]

Done. Thanks.

+        entry->SetSearchTerms(search_terms);
       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
   // and pastes it into another program, that program may think the URL ends at
@@ skipping 163 matching lines @@
   template_url->ExtractSearchTermsFromURL(url, &result);
   return result;
 }
 
 Profile* ToolbarModelImpl::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
   return navigation_controller ?
       Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
       NULL;
 }