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

chrome/browser/search_engines/template_url_model.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_model.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
@@ skipping 178 matching lines @@
 // static
 GURL TemplateURLModel::GenerateSearchURL(const TemplateURL* t_url) {
   DCHECK(t_url);
   const TemplateURLRef* search_ref = t_url->url();
   if (!search_ref || !search_ref->IsValid())
     return GURL();
 
   if (!search_ref->SupportsReplacement())
     return GURL(WideToUTF8(search_ref->url()));
 
-  return search_ref->ReplaceSearchTerms(
-      *t_url,
-      kReplacementTerm,
-      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring());
+  return GURL(WideToUTF8(search_ref->ReplaceSearchTerms(
+      *t_url, kReplacementTerm, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
+      std::wstring())));
 }
 
 bool TemplateURLModel::CanReplaceKeyword(
     const std::wstring& keyword,
     const std::wstring& url,
     const TemplateURL** template_url_to_replace) {
   DCHECK(!keyword.empty()); // This should only be called for non-empty
                             // keywords. If we need to support empty kewords
                             // the code needs to change slightly.
   const TemplateURL* existing_url = GetTemplateURLForKeyword(keyword);
@@ skipping 789 matching lines @@
       AddToMaps(t_url);
       something_changed = true;
     }
   }
 
   if (something_changed && loaded_) {
     FOR_EACH_OBSERVER(TemplateURLModelObserver, model_observers_,
                       OnTemplateURLModelChanged());
   }
 }