Fix cursor position for default provider searches in keyword mode.

chrome/browser/autocomplete/keyword_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 keyword autocomplete provider. The keyword provider
 // is responsible for remembering/suggesting user "search keyword queries"
 // (e.g.  "imdb Godzilla") and then fixing them up into valid URLs.  An
 // instance of it gets created and managed by the autocomplete controller.
 // KeywordProvider uses a TemplateURLService to find the set of keywords.
 
@@ skipping 54 matching lines @@
 
   // Returns the replacement string from the user input. The replacement
   // string is the portion of the input that does not contain the keyword.
   // For example, the replacement string for "b blah" is blah.
   // If |trim_leading_whitespace| is true then leading whitespace in
   // replacement string will be trimmed.
   static string16 SplitReplacementStringFromInput(const string16& input,
                                                   bool trim_leading_whitespace);
 
   // Returns the matching substituting keyword for |input|, or NULL if there
-  // is no keyword for the specified input.
+  // is no keyword for the specified input.  If the matching keyword was found,
+  // updates |input|'s text and cursor position.

[Mark P, 2013/01/25 21:19:15]

// Assumes model is already loaded.

[Bart N., 2013/01/29 21:28:17]

That is not true. The model may still not be initialized, because of the
asynchronous nature of the load.

   static const TemplateURL* GetSubstitutingTemplateURLForInput(
-                                              Profile* profile,
-                                              const AutocompleteInput& input,
-                                              string16* remaining_input);
+      TemplateURLService* model,
+      AutocompleteInput* input);
 
   // If |text| corresponds (in the sense of
   // TemplateURLModel::CleanUserInputKeyword()) to an enabled, substituting
   // keyword, returns that keyword; returns the empty string otherwise.
   string16 GetKeywordForText(const string16& text) const;
 
   // Creates a fully marked-up AutocompleteMatch for a specific keyword.
   AutocompleteMatch CreateAutocompleteMatch(const string16& text,
                                             const string16& keyword,
                                             const AutocompleteInput& input);
@@ skipping 76 matching lines @@
   // If non-empty, holds the ID of the extension whose keyword is currently in
   // the URL bar while the autocomplete popup is open.
   std::string current_keyword_extension_id_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_