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

chrome/browser/ui/views/uninstall_view.cc

 // Copyright (c) 2011 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/ui/views/uninstall_view.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 
   GridLayout* layout = GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   // Message to confirm uninstallation.
   int column_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_set_id);
-  confirm_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_UNINSTALL_VERIFY));
+  confirm_label_ = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_UNINSTALL_VERIFY)));
   confirm_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->AddView(confirm_label_);
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   // The "delete profile" check box.
   ++column_set_id;
   column_set = layout->AddColumnSet(column_set_id);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
@@ skipping 85 matching lines @@
   DCHECK(!browsers_->empty());
   return browsers_->size();
 }
 
 string16 UninstallView::GetItemAt(int index) {
   DCHECK_LT(index, static_cast<int>(browsers_->size()));
   BrowsersMap::const_iterator it = browsers_->begin();
   std::advance(it, index);
   return WideToUTF16Hack((*it).first);
 }