Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/ui/views/importer/import_progress_dialog_view.cc

Index: chrome/browser/ui/views/importer/import_progress_dialog_view.cc
===================================================================
--- chrome/browser/ui/views/importer/import_progress_dialog_view.cc	(revision 104083)
+++ chrome/browser/ui/views/importer/import_progress_dialog_view.cc	(working copy)
@@ -30,16 +30,16 @@
       state_passwords_(new views::CheckmarkThrobber),
       state_history_(new views::CheckmarkThrobber),
       state_cookies_(new views::CheckmarkThrobber),
-      label_bookmarks_(new views::Label(
-          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS))),
-      label_searches_(new views::Label(
-          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_SEARCH))),
-      label_passwords_(new views::Label(
-          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_PASSWORDS))),
-      label_history_(new views::Label(
-          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_HISTORY))),
-      label_cookies_(new views::Label(
-          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_COOKIES))),
+      label_bookmarks_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS)))),
+      label_searches_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_SEARCH)))),
+      label_passwords_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_PASSWORDS)))),
+      label_history_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_HISTORY)))),
+      label_cookies_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_COOKIES)))),
       parent_window_(parent_window),
       items_(items),
       importer_host_(importer_host),
@@ -289,7 +289,7 @@
                               const SourceProfile& source_profile,
                               Profile* target_profile,
                               bool first_run) {
-  DCHECK_NE(items, 0u);
+  DCHECK(items != 0);
   ImportProgressDialogView* progress_view = new ImportProgressDialogView(
       parent_window,
       items,