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

chrome/browser/importer/importer.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/importer/importer.h"
 
 #include <map>
 #include <set>
 
 #include "app/gfx/favicon_size.h"
@@ skipping 173 matching lines @@
 // 'http://...{Language}...'. As {Language} is not a valid OSDD parameter value
 // the TemplateURL is invalid.
 static std::string BuildHostPathKey(const TemplateURL* t_url,
                                     bool try_url_if_invalid) {
   if (t_url->url()) {
     if (try_url_if_invalid && !t_url->url()->IsValid())
       return HostPathKeyForURL(GURL(WideToUTF8(t_url->url()->url())));
 
     if (t_url->url()->SupportsReplacement()) {
       return HostPathKeyForURL(
-          t_url->url()->ReplaceSearchTerms(
+          GURL(WideToUTF8(t_url->url()->ReplaceSearchTerms(
               *t_url, L"random string",
-              TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()));
+              TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))));
     }
   }
   return std::string();
 }
 
 // Builds a set that contains an entry of the host+path for each TemplateURL in
 // the TemplateURLModel that has a valid search url.
 static void BuildHostPathMap(const TemplateURLModel& model,
                              HostPathMap* host_path_map) {
   std::vector<const TemplateURL*> template_urls = model.GetTemplateURLs();
@@ skipping 548 matching lines @@
     ProfileInfo* google_toolbar = new ProfileInfo();
     google_toolbar->browser_type = GOOGLE_TOOLBAR5;
     google_toolbar->description = l10n_util::GetString(
                                   IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
     google_toolbar->source_path.clear();
     google_toolbar->app_path.clear();
     google_toolbar->services_supported = FAVORITES;
     source_profiles_.push_back(google_toolbar);
   }
 }