Change std::wstring to string16 for views::Label and views::Link

views/examples/examples_main.cc

Index: views/examples/examples_main.cc
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 3287cbfacc35d73e29f9f7e56dc94d834390f456..6656558d9e658f82672e2761851e75053e8864d3 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -103,7 +103,7 @@ void ExamplesMain::Init() {
   examples_.push_back(new WidgetExample(this));
   examples_.push_back(new MenuExample(this));
 
-  for(std::vector<ExampleBase*>::const_iterator i(examples_.begin());
+  for (std::vector<ExampleBase*>::const_iterator i(examples_.begin());
       i != examples_.end(); ++i)
     AddExample(*i);
 
@@ -111,7 +111,7 @@ void ExamplesMain::Init() {
 }
 
 void ExamplesMain::SetStatus(const std::string& status) {
-  status_label_->SetText(UTF8ToWide(status));
+  status_label_->SetText(UTF8ToUTF16(status));
 }
 
 void ExamplesMain::AddExample(ExampleBase* example) {