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

chrome/browser/ui/views/first_run_search_engine_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/first_run_search_engine_view.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 307 matching lines @@
     background_image_->SetHorizontalAlignment(ImageView::LEADING);
   } else {
     background_image_->SetHorizontalAlignment(ImageView::TRAILING);
   }
 
   AddChildView(background_image_);
 
   int label_width = GetPreferredSize().width() - 2 * views::kPanelHorizMargin;
 
   // Add title and text asking the user to choose a search engine:
-  title_label_ = new Label(l10n_util::GetStringUTF16(
-      IDS_FR_SEARCH_MAIN_LABEL));
+  title_label_ = new Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_FR_SEARCH_MAIN_LABEL)));
   title_label_->SetColor(SK_ColorBLACK);
   title_label_->SetFont(title_label_->font().DeriveFont(3, gfx::Font::BOLD));
   title_label_->SetMultiLine(true);
   title_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   title_label_->SizeToFit(label_width);
   AddChildView(title_label_);
 
-  text_label_ = new Label(l10n_util::GetStringFUTF16(
+  text_label_ = new Label(UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_FR_SEARCH_TEXT,
-      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
   text_label_->SetColor(SK_ColorBLACK);
   text_label_->SetFont(text_label_->font().DeriveFont(1, gfx::Font::NORMAL));
   text_label_->SetMultiLine(true);
   text_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   text_label_->SizeToFit(label_width);
   AddChildView(text_label_);
 }
 
 void FirstRunSearchEngineView::Layout() {
   // Disable the close button.
@@ skipping 104 matching lines @@
       search_engine_choices_[3]->SetBounds(next_h_space, next_v_space,
                                            button_width, button_height);
     }
   }  // if (search_engine_choices.size() > 0)
 }
 
 void FirstRunSearchEngineView::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }