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

views/focus/focus_manager_unittest.cc

Index: views/focus/focus_manager_unittest.cc
===================================================================
--- views/focus/focus_manager_unittest.cc	(revision 104083)
+++ views/focus/focus_manager_unittest.cc	(working copy)
@@ -497,7 +497,7 @@
   int y = 10;
   int gap_between_labels = 10;
 
-  Label* label = new Label(ASCIIToUTF16("Apple:"));
+  Label* label = new Label(L"Apple:");
   label->set_id(kAppleLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
@@ -510,7 +510,7 @@
 
   y += label_height + gap_between_labels;
 
-  label = new Label(ASCIIToUTF16("Orange:"));
+  label = new Label(L"Orange:");
   label->set_id(kOrangeLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
@@ -523,7 +523,7 @@
 
   y += label_height + gap_between_labels;
 
-  label = new Label(ASCIIToUTF16("Banana:"));
+  label = new Label(L"Banana:");
   label->set_id(kBananaLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
@@ -536,7 +536,7 @@
 
   y += label_height + gap_between_labels;
 
-  label = new Label(ASCIIToUTF16("Kiwi:"));
+  label = new Label(L"Kiwi:");
   label->set_id(kKiwiLabelID);
   left_container_->AddChildView(label);
   label->SetBounds(label_x, y, label_width, label_height);
@@ -616,11 +616,11 @@
       Background::CreateSolidBackground(200, 200, 200));
   scroll_view->SetContents(scroll_content);
 
-  static const char* const kTitles[] = {
-      "Rosetta", "Stupeur et tremblement", "The diner game",
-      "Ridicule", "Le placard", "Les Visiteurs", "Amelie",
-      "Joyeux Noel", "Camping", "Brice de Nice",
-      "Taxi", "Asterix"
+  static const wchar_t* const kTitles[] = {
+      L"Rosetta", L"Stupeur et tremblement", L"The diner game",
+      L"Ridicule", L"Le placard", L"Les Visiteurs", L"Amelie",
+      L"Joyeux Noel", L"Camping", L"Brice de Nice",
+      L"Taxi", L"Asterix"
   };
 
   static const int kIDs[] = {
@@ -634,7 +634,7 @@
 
   y = 5;
   for (size_t i = 0; i < arraysize(kTitles); ++i) {
-    Link* link = new Link(ASCIIToUTF16(kTitles[i]));
+    Link* link = new Link(kTitles[i]);
     link->SetHorizontalAlignment(Label::ALIGN_LEFT);
     link->set_id(kIDs[i]);
     scroll_content->AddChildView(link);
@@ -681,7 +681,7 @@
   cb->SetBounds(130, 10, 70, 20);
   cb->set_id(kUnderlinedCheckBoxID);
 
-  Link* link = new Link(ASCIIToUTF16("Help"));
+  Link* link = new Link(L"Help");
   contents->AddChildView(link);
   link->SetBounds(10, 35, 70, 10);
   link->set_id(kStyleHelpLinkID);
@@ -711,7 +711,7 @@
   button->SetBounds(112, 5, 60, 30);
   button->set_id(kSearchButtonID);
 
-  link = new Link(ASCIIToUTF16("Help"));
+  link = new Link(L"Help");
   link->SetHorizontalAlignment(Label::ALIGN_LEFT);
   link->set_id(kHelpLinkID);
   contents->AddChildView(link);
@@ -1283,6 +1283,7 @@
         EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
+
 }
 
 // Counts accelerator calls.
@@ -1450,7 +1451,7 @@
 class MessageTrackingView : public View {
  public:
   MessageTrackingView() : accelerator_pressed_(false) {
-  }
+ }
 
   virtual bool OnKeyPressed(const KeyEvent& e) {
     keys_pressed_.push_back(e.key_code());
@@ -1663,7 +1664,7 @@
 
   class TestFocusManagerFactory : public FocusManagerFactory {
    public:
-    explicit TestFocusManagerFactory(DtorTrackVector* dtor_tracker)
+    TestFocusManagerFactory(DtorTrackVector* dtor_tracker)
         : dtor_tracker_(dtor_tracker) {
     }
 
@@ -1692,7 +1693,7 @@
 
   class WindowDtorTracked : public Widget {
    public:
-    explicit WindowDtorTracked(DtorTrackVector* dtor_tracker)
+    WindowDtorTracked(DtorTrackVector* dtor_tracker)
         : dtor_tracker_(dtor_tracker) {
     }