Fixes bug where keyword editor would end up prefixing all keyword urls...

chrome/browser/autocomplete/search_provider.cc

 // Copyright (c) 2009 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/search_provider.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 347 matching lines @@
   ConvertResultsToAutocompleteMatches();
   listener_->OnProviderUpdate(!results->empty());
 }
 
 URLFetcher* SearchProvider::CreateSuggestFetcher(int id,
                                                  const TemplateURL& provider,
                                                  const std::wstring& text) {
   const TemplateURLRef* const suggestions_url = provider.suggestions_url();
   DCHECK(suggestions_url->SupportsReplacement());
   URLFetcher* fetcher = URLFetcher::Create(id,
-      suggestions_url->ReplaceSearchTerms(
+      GURL(WideToUTF8(suggestions_url->ReplaceSearchTerms(
           provider, text, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
-          std::wstring()),
+          std::wstring()))),
       URLFetcher::GET, this);
   fetcher->set_request_context(profile_->GetRequestContext());
   fetcher->Start();
   return fetcher;
 }
 
 bool SearchProvider::ParseSuggestResults(Value* root_val,
                                          bool is_keyword,
                                          const std::wstring& input_text,
                                          SuggestResults* suggest_results) {
@@ skipping 375 matching lines @@
   match.fill_into_edit.append(query_string);
   // NOTE: All Google suggestions currently start with the original input, but
   // not all Yahoo! suggestions do.
   if (!input_.prevent_inline_autocomplete() &&
       !match.fill_into_edit.compare(search_start, input_text.length(),
                                    input_text))
     match.inline_autocomplete_offset = search_start + input_text.length();
 
   const TemplateURLRef* const search_url = provider.url();
   DCHECK(search_url->SupportsReplacement());
-  match.destination_url = search_url->ReplaceSearchTerms(provider,
-                                                         query_string,
-                                                         accepted_suggestion,
-                                                         input_text);
+  match.destination_url =
+      GURL(WideToUTF8(search_url->ReplaceSearchTerms(provider, query_string,
+                                                     accepted_suggestion,
+                                                     input_text)));
 
   // Search results don't look like URLs.
   match.transition =
       is_keyword ? PageTransition::KEYWORD : PageTransition::GENERATED;
 
   // Try to add |match| to |map|.  If a match for |query_string| is already in
   // |map|, replace it if |match| is more relevant.
   // NOTE: Keep this ToLower() call in sync with url_database.cc.
   const std::pair<MatchMap::iterator, bool> i = map->insert(
       std::pair<std::wstring, AutocompleteMatch>(
@@ skipping 36 matching lines @@
   // values preserve that property.  Otherwise, if the user starts editing a
   // suggestion, non-Search results will suddenly appear.
   if (input_.type() == AutocompleteInput::FORCED_QUERY)
     match.fill_into_edit.assign(L"?");
   match.fill_into_edit.append(match.contents);
   // TODO(pkasting): http://b/1112879 These should perhaps be
   // inline-autocompletable?
 
   return match;
 }