Remove wstrings from bookmarks, part 12.

chrome/browser/views/importer_view.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/views/importer_view.h"
 
 #include "app/l10n_util.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
@@ skipping 158 matching lines @@
 }
 
 int ImporterView::GetItemCount() {
   DCHECK(importer_host_.get());
   int item_count = importer_host_->GetAvailableProfileCount();
   if (checkbox_items_.size() < static_cast<size_t>(item_count))
     checkbox_items_.resize(item_count, initial_state_);
   return item_count;
 }
 
-std::wstring ImporterView::GetItemAt(int index) {
+string16 ImporterView::GetItemAt(int index) {
   DCHECK(importer_host_.get());
-  return importer_host_->GetSourceProfileNameAt(index);
+  return WideToUTF16Hack(importer_host_->GetSourceProfileNameAt(index));
 }
 
 void ImporterView::ItemChanged(views::Combobox* combobox,
                                int prev_index, int new_index) {
   DCHECK(combobox);
   DCHECK(checkbox_items_.size() >=
       static_cast<size_t>(importer_host_->GetAvailableProfileCount()));
 
   if (prev_index == new_index)
     return;
@@ skipping 77 matching lines @@
   if (favorites_checkbox_->IsEnabled())
     favorites_checkbox_->SetChecked(!!(items & importer::FAVORITES));
 
   if (passwords_checkbox_->IsEnabled())
     passwords_checkbox_->SetChecked(!!(items & importer::PASSWORDS));
 
   if (search_engines_checkbox_->IsEnabled())
     search_engines_checkbox_->SetChecked(!!(items &
                                             importer::SEARCH_ENGINES));
 }