Fix cursor position for default provider searches in keyword mode.

chrome/browser/autocomplete/keyword_provider.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/autocomplete/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/string16.h"
@@ skipping 118 matching lines @@
 
   // And extract the replacement string.
   string16 remaining_input;
   SplitKeywordFromInput(trimmed_input, trim_leading_whitespace,
       &remaining_input);
   return remaining_input;
 }
 
 // static
 const TemplateURL* KeywordProvider::GetSubstitutingTemplateURLForInput(
-    Profile* profile,
-    const AutocompleteInput& input,
-    string16* remaining_input) {
-  if (!input.allow_exact_keyword_match())
+    TemplateURLService* model,
+    AutocompleteInput* input) {
+  if (!input->allow_exact_keyword_match())
     return NULL;
 
-  string16 keyword;
-  if (!ExtractKeywordFromInput(input, &keyword, remaining_input))
+  string16 keyword, remaining_input;
+  if (!ExtractKeywordFromInput(*input, &keyword, &remaining_input))
     return NULL;
 
-  // Make sure the model is loaded. This is cheap and quickly bails out if
-  // the model is already loaded.
-  TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(profile);
   DCHECK(model);
-  model->Load();
+  const TemplateURL* template_url = model->GetTemplateURLForKeyword(keyword);
+  if (template_url && template_url->SupportsReplacement()) {
+    // TODO(bartn): For now, none of the keyword providers support cursor
+    // position, so let's not bother with adjusting it to reflect the stripped
+    // keyword part from the input.

[Mark P, 2013/01/24 04:07:21]

Some people do their searches using google as a keyword provider.  Can you
please make this work correctly?  Without this, I consider this change a
regression: we'd go from supporting google this is |test with cursor position in
the keyword provider but not the default provider to not supporting it in the
keyword but supporting it in the default (which is much less likely to get a
suggestion).

Please correct me if my understanding is wrong.

[Bart N., 2013/01/24 18:32:04]

You are right. I forgot about this case (BTW, any idea how often it happens?).

I've just implemented it right away and updated unit tests.

[Mark P, 2013/01/24 19:32:15]

I assume cursor position mucking happens at a similar rate in keyword mode as
for default provider mode.

Users are in keyword mode for at least 1% of omnibox interactions.  (~1% of
usage comes from keyword mode, and search suggest that comes from keyword mode
are not tagged any differently than default provider suggestions so the number
is probably quite a bit more than that).

+    input->UpdateText(remaining_input, string16::npos, input->parts());
+    return template_url;
+  }
 
-  const TemplateURL* template_url = model->GetTemplateURLForKeyword(keyword);
-  return (template_url && template_url->SupportsReplacement()) ?
-      template_url : NULL;
+  return NULL;
 }
 
 string16 KeywordProvider::GetKeywordForText(
     const string16& text) const {
   const string16 keyword(TemplateURLService::CleanUserInputKeyword(text));
 
   if (keyword.empty())
     return keyword;
 
   TemplateURLService* url_service = GetTemplateURLService();
@@ skipping 418 matching lines @@
 }
 
 void KeywordProvider::MaybeEndExtensionKeywordMode() {
   if (!current_keyword_extension_id_.empty()) {
     extensions::ExtensionOmniboxEventRouter::OnInputCancelled(
         profile_, current_keyword_extension_id_);
 
     current_keyword_extension_id_.clear();
   }
 }