Fix cursor position for default provider searches in keyword mode.

chrome/browser/autocomplete/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all non-keyword autocomplete entries that start with
 // "Search <engine> for ...", including searching for the current input string,
 // search history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 223 matching lines @@
   // Apply calculated relevance scores to the current results.
   void ApplyCalculatedRelevance();
   void ApplyCalculatedSuggestRelevance(SuggestResults* list, bool is_keyword);
   void ApplyCalculatedNavigationRelevance(NavigationResults* list,
                                           bool is_keyword);
 
   // Starts a new URLFetcher requesting suggest results from |template_url|;
   // callers own the returned URLFetcher, which is NULL for invalid providers.
   net::URLFetcher* CreateSuggestFetcher(int id,
                                         const TemplateURL* template_url,
-                                        const string16& text);
+                                        const AutocompleteInput& input);
 
   // Parses results from the suggest server and updates the appropriate suggest
   // and navigation result lists, depending on whether |is_keyword| is true.
   // Returns whether the appropriate result list members were updated.
   bool ParseSuggestResults(base::Value* root_val, bool is_keyword);
 
   // Converts the parsed results to a set of AutocompleteMatches, |matches_|.
   void ConvertResultsToAutocompleteMatches();
 
   // Checks if suggested relevances violate certain expected constraints.
@@ skipping 69 matching lines @@
 
   // Updates the value of |done_| from the internal state.
   void UpdateDone();
 
   // Maintains the TemplateURLs used.
   Providers providers_;
 
   // The user's input.
   AutocompleteInput input_;
 
-  // Input text when searching against the keyword provider.
-  string16 keyword_input_text_;
+  // Input when searching against the keyword provider.
+  AutocompleteInput keyword_input_;
 
   // Searches in the user's history that begin with the input text.
   HistoryResults keyword_history_results_;
   HistoryResults default_history_results_;
 
   // Number of suggest results that haven't yet arrived. If greater than 0 it
   // indicates one of the URLFetchers is still running.
   int suggest_results_pending_;
 
   // A timer to start a query to the suggest server after the user has stopped
@@ skipping 40 matching lines @@
   bool field_trial_triggered_;
 
   // Same as above except that it is maintained across the current Omnibox
   // session.
   bool field_trial_triggered_in_session_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_