Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/importer/importer_bridge.cc

 // Copyright (c) 2010 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_bridge.h"
 
 #include "app/l10n_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string16.h"
@@ skipping 99 matching lines @@
       NewRunnableMethod(host_, &ImporterHost::ImportStarted));
 }
 
 void InProcessImporterBridge::NotifyEnded() {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(host_, &ImporterHost::ImportEnded));
 }
 
 std::wstring InProcessImporterBridge::GetLocalizedString(int message_id) {
-  return l10n_util::GetString(message_id);
+  return UTF16ToWideHack(l10n_util::GetStringUTF16(message_id));
 }
 
 InProcessImporterBridge::~InProcessImporterBridge() {}
 
 ExternalProcessImporterBridge::ExternalProcessImporterBridge(
     ProfileImportThread* profile_import_thread,
     const DictionaryValue& localized_strings)
     : profile_import_thread_(profile_import_thread) {
   // Bridge needs to make its own copy because OS 10.6 autoreleases the
   // localized_strings value that is passed in (see http://crbug.com/46003 ).
@@ skipping 64 matching lines @@
 
 // TODO(viettrungluu): convert to string16.
 std::wstring ExternalProcessImporterBridge::GetLocalizedString(
     int message_id) {
   string16 message;
   localized_strings_->GetString(base::IntToString(message_id), &message);
   return UTF16ToWideHack(message);
 }
 
 ExternalProcessImporterBridge::~ExternalProcessImporterBridge() {}