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

chrome/browser/dom_ui/new_tab_ui.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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
@@ skipping 861 matching lines @@
   if (!template_url) {
     // The keyword seems to have changed out from under us.
     // Not an error, but nothing we can do...
     return;
   }
   const TemplateURLRef* url_ref = template_url->url();
   if (!url_ref || !url_ref->SupportsReplacement()) {
     NOTREACHED();
     return;
   }
-  GURL url = url_ref->ReplaceSearchTerms(*template_url, search,
-      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring());
+  GURL url = GURL(WideToUTF8(url_ref->ReplaceSearchTerms(*template_url, search,
+      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring())));
 
   if (url.is_valid()) {
     // Record the user action
     std::vector<const TemplateURL*> urls =
         template_url_model_->GetTemplateURLs();
     sort(urls.begin(), urls.end(), TemplateURLSortByUsage);
     ListValue urls_value;
     int item_number = 0;
     for (size_t i = 0;
          i < std::min<size_t>(urls.size(), kSearchURLs); ++i) {
@@ skipping 541 matching lines @@
 // static
 void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
   MostVisitedHandler::RegisterUserPrefs(prefs);
 }
 
 // static
 bool NewTabUI::EnableNewNewTabPage() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kNewNewTabPage);
 }