Fix cursor position for default provider searches in keyword mode.

chrome/browser/autocomplete/keyword_provider.h

Index: chrome/browser/autocomplete/keyword_provider.h
diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index f92f9d3d51052bbaf728dbd4f20031c027b0fc7f..c9caba1f104891b75c13be4b82d6cdbb0d29b817 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -72,11 +72,11 @@ class KeywordProvider : public AutocompleteProvider,
                                                   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