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

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2006-2008 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/search_engines/template_url.h"
 
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 212 matching lines @@
           std::string::npos) {
         search_term_key_ = query_string.substr(key.begin, key.len);
         host_ = url.host();
         path_ = url.path();
         break;
       }
     }
   }
 }
 
-GURL TemplateURLRef::ReplaceSearchTerms(
+std::wstring TemplateURLRef::ReplaceSearchTerms(
     const TemplateURL& host,
     const std::wstring& terms,
     int accepted_suggestion,
     const std::wstring& original_query_for_suggestion) const {
   ParseIfNecessary();
   if (!valid_)
-    return GURL();
+    return std::wstring();
 
   if (replacements_.empty())
-    return GURL(WideToUTF8(parsed_url_));
+    return parsed_url_;
 
   // Encode the search terms so that we know the encoding.
   const std::vector<std::string>& encodings = host.input_encodings();
   std::wstring encoded_terms;
   std::wstring encoded_original_query;
   std::wstring input_encoding;
   for (size_t i = 0; i < encodings.size(); ++i) {
     if (EscapeQueryParamValue(terms, encodings[i].c_str(), &encoded_terms)) {
       if (!original_query_for_suggestion.empty()) {
         EscapeQueryParamValue(original_query_for_suggestion,
@@ skipping 69 matching lines @@
       case SEARCH_TERMS:
         url.insert(i->index, encoded_terms);
         break;
 
       default:
         NOTREACHED();
         break;
     }
   }
 
-  return GURL(WideToUTF8(url));
+  return url;
 }
 
 bool TemplateURLRef::SupportsReplacement() const {
   ParseIfNecessary();
   return valid_ && supports_replacements_;
 }
 
 bool TemplateURLRef::IsValid() const {
   ParseIfNecessary();
   return valid_;
@@ skipping 222 matching lines @@
   }
   return GURL();
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
   if (autogenerate_keyword_)
     keyword_.clear();
 }