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

chrome/browser/browser_init.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/browser_init.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
 #include "app/l10n_util.h"
@@ skipping 549 matching lines @@
           profile->GetTemplateURLModel()->GetDefaultSearchProvider();
       if (!default_provider || !default_provider->url()) {
         // No search provider available. Just treat this as regular URL.
         urls.push_back(
             GURL(WideToUTF8(URLFixerUpper::FixupRelativeFile(cur_dir_,
                                                              value))));
         continue;
       }
       const TemplateURLRef* search_url = default_provider->url();
       DCHECK(search_url->SupportsReplacement());
-      urls.push_back(GURL(search_url->ReplaceSearchTerms(*default_provider,
-          value.substr(2), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
-          std::wstring())));
+      urls.push_back(GURL(WideToUTF8(search_url->ReplaceSearchTerms(
+          *default_provider, value.substr(2),
+          TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))));
     } else {
       // This will create a file URL or a regular URL.
       urls.push_back(GURL(WideToUTF8(
           URLFixerUpper::FixupRelativeFile(cur_dir_, value))));
     }
   }
   return urls;
 }
 
 void BrowserInit::LaunchWithProfile::AddStartupURLs(
@@ skipping 214 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }