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

chrome/browser/importer/importer_list.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_list.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
@@ skipping 33 matching lines @@
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 void DetectSafariProfiles(std::vector<importer::ProfileInfo*>* profiles) {
   uint16 items = importer::NONE;
   if (!SafariImporter::CanImport(mac_util::GetUserLibraryPath(), &items))
     return;
 
   importer::ProfileInfo* safari = new importer::ProfileInfo();
   safari->browser_type = importer::SAFARI;
-  safari->description =
-      UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_SAFARI));
+  safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI);
   safari->source_path.clear();
   safari->app_path.clear();
   safari->services_supported = items;
   profiles->push_back(safari);
 }
 #endif  // defined(OS_MACOSX)
 
 void DetectFirefoxProfiles(std::vector<importer::ProfileInfo*>* profiles) {
   FilePath profile_path = GetFirefoxProfilePath();
   if (profile_path.empty())
@@ skipping 12 matching lines @@
   if (version == 2) {
     firefox_type = importer::FIREFOX2;
   } else if (version >= 3) {
     firefox_type = importer::FIREFOX3;
   } else {
     // Ignores other versions of firefox.
     return;
   }
 
   importer::ProfileInfo* firefox = new importer::ProfileInfo();
-  firefox->description =
-      UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_FIREFOX));
+  firefox->description = l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX);
   firefox->browser_type = firefox_type;
   firefox->source_path = profile_path;
 #if defined(OS_WIN)
   firefox->app_path = FilePath::FromWStringHack(
       GetFirefoxInstallPathFromRegistry());
 #endif
   if (firefox->app_path.empty())
     firefox->app_path = app_path;
   firefox->services_supported = importer::HISTORY | importer::FAVORITES |
       importer::PASSWORDS | importer::SEARCH_ENGINES;
   profiles->push_back(firefox);
 }
 
 void DetectGoogleToolbarProfiles(
     std::vector<importer::ProfileInfo*>* profiles) {
   if (FirstRun::IsChromeFirstRun())
     return;
 
   importer::ProfileInfo* google_toolbar = new importer::ProfileInfo();
   google_toolbar->browser_type = importer::GOOGLE_TOOLBAR5;
-  google_toolbar->description = UTF16ToWideHack(l10n_util::GetStringUTF16(
-      IDS_IMPORT_FROM_GOOGLE_TOOLBAR));
+  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 = importer::FAVORITES;
   profiles->push_back(google_toolbar);
 }
 
 }  // namespace
 
 // static
 Importer* ImporterList::CreateImporterByType(importer::ProfileType type) {
@@ skipping 133 matching lines @@
   BrowserThread::ID current_thread_id;
   BrowserThread::GetCurrentThreadIdentifier(&current_thread_id);
   DCHECK_EQ(current_thread_id, source_thread_id_);
 
   source_profiles_->assign(profiles.begin(), profiles.end());
   source_profiles_loaded_ = true;
   observer_->SourceProfilesLoaded();
   observer_ = NULL;
   source_thread_id_ = BrowserThread::UI;
 }