Ensures the autocomplete_controller input is saved and restored when changing tabs.

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.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/webui/omnibox/omnibox_ui_handler.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "content/public/browser/web_ui.h"
 
 OmniboxUIHandler::OmniboxUIHandler(Profile* profile): profile_(profile) {
@@ skipping 44 matching lines @@
 //   }
 // }
 // For reference, the javascript code that unpacks this object and
 // displays it is in chrome/browser/resources/omnibox.js
 void OmniboxUIHandler::OnResultChanged(bool default_match_changed) {
   base::DictionaryValue result_to_output;
   // Fill in general information.
   result_to_output.SetBoolean("done", controller_->done());
   result_to_output.SetInteger("time_since_omnibox_started_ms",
       (base::Time::Now() - time_omnibox_started_).InMilliseconds());
-  const base::string16& host = controller_->input().text().substr(
-      controller_->input().parts().host.begin,
-      controller_->input().parts().host.len);
+  const base::string16& host = input_.text().substr(
+      input_.parts().host.begin,
+      input_.parts().host.len);
   result_to_output.SetString("host", host);
   bool is_typed_host;
   if (LookupIsTypedHost(host, &is_typed_host)) {
     // If we successfully looked up whether the host part of the omnibox
     // input (this interprets the input as a host plus optional path) as
     // a typed host, then record this information in the output.
     result_to_output.SetBoolean("is_typed_host", is_typed_host);
   }
   // Fill in the merged/combined results the controller has provided.
   AddResultToDictionary("combined_results", controller_->result().begin(),
@@ skipping 95 matching lines @@
   int current_page_classification;
   return_val = input->GetInteger(4, &current_page_classification);
   DCHECK(return_val);
   // Reset the controller.  If we don't do this, then the
   // AutocompleteController might inappropriately set its |minimal_changes|
   // variable (or something else) and some providers will short-circuit
   // important logic and return stale results.  In short, we want the
   // actual results to not depend on the state of the previous request.
   ResetController();
   time_omnibox_started_ = base::Time::Now();
-  controller_->Start(AutocompleteInput(
+  input_ = AutocompleteInput(
       input_string,
       cursor_position,
       base::string16(),  // user's desired tld (top-level domain)
       GURL(),
       static_cast<AutocompleteInput::PageClassification>(
           current_page_classification),
       prevent_inline_autocomplete,
       prefer_keyword,
       true,  // allow exact keyword matches
-      true));  // want all matches
+      true);
+  controller_->Start(input_);  // want all matches
 }
 
 void OmniboxUIHandler::ResetController() {
   controller_.reset(new AutocompleteController(profile_, this,
           AutocompleteClassifier::kDefaultOmniboxProviders));
 }