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

views/focus/focus_manager_unittest.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 "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 479 matching lines @@
   content_view_->AddChildView(left_container_);
   left_container_->SetBounds(10, 35, 250, 200);
 
   int label_x = 5;
   int label_width = 50;
   int label_height = 15;
   int text_field_width = 150;
   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);
 
   Textfield* text_field = new Textfield();
   text_field->set_id(kAppleTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   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);
 
   text_field = new Textfield();
   text_field->set_id(kOrangeTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   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);
 
   text_field = new Textfield();
   text_field->set_id(kBananaTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   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);
 
   text_field = new Textfield();
   text_field->set_id(kKiwiTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
@@ skipping 59 matching lines @@
   scroll_view->set_id(kScrollViewID);
   inner_container->AddChildView(scroll_view);
   scroll_view->SetBounds(1, 1, 148, 178);
 
   View* scroll_content = new View();
   scroll_content->SetBounds(0, 0, 200, 200);
   scroll_content->set_background(
       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[] = {
       kRosettaLinkID, kStupeurEtTremblementLinkID, kDinerGameLinkID,
       kRidiculeLinkID, kClosetLinkID, kVisitingLinkID, kAmelieLinkID,
       kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID,
       kTaxiLinkID, kAsterixLinkID
   };
 
   DCHECK(arraysize(kTitles) == arraysize(kIDs));
 
   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);
     link->SetBounds(5, y, 300, 15);
     y += 15;
   }
 
   y = 250;
   int width = 60;
   button = new NativeTextButton(NULL, L"OK");
@@ skipping 26 matching lines @@
   cb = new Checkbox(L"Italic");
   contents->AddChildView(cb);
   cb->SetBounds(70, 10, 50, 20);
   cb->set_id(kItalicCheckBoxID);
 
   cb = new Checkbox(L"Underlined");
   contents->AddChildView(cb);
   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);
 
   text_field = new Textfield();
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 50, 100, 20);
   text_field->set_id(kStyleTextEditID);
 
   style_tab_ = new TabbedPane();
   style_tab_->set_id(kStyleContainerID);
   content_view_->AddChildView(style_tab_);
   style_tab_->SetBounds(10, y, 210, 100);
   style_tab_->AddTab(ASCIIToUTF16("Style"), contents);
   style_tab_->AddTab(ASCIIToUTF16("Other"), new View());
 
   // Right bottom box with search.
   contents = new View();
   contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
   text_field = new Textfield();
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 10, 100, 20);
   text_field->set_id(kSearchTextfieldID);
 
   button = new NativeTextButton(NULL, L"Search");
   contents->AddChildView(button);
   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);
   link->SetBounds(175, 10, 30, 20);
 
   search_border_view_ = new BorderView(contents);
   search_border_view_->set_id(kSearchContainerID);
 
   content_view_->AddChildView(search_border_view_);
   search_border_view_->SetBounds(300, y, 240, 50);
@@ skipping 551 matching lines @@
   FindViewByID(kBroccoliButtonID)->RequestFocus();
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kRightTraversalIDs) - 1; j >= 0; --j) {
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
+
 }
 
 // Counts accelerator calls.
 class TestAcceleratorTarget : public AcceleratorTarget {
  public:
   explicit TestAcceleratorTarget(bool process_accelerator)
       : accelerator_count_(0), process_accelerator_(process_accelerator) {}
 
   virtual bool AcceleratorPressed(const Accelerator& accelerator) {
     ++accelerator_count_;
@@ skipping 147 matching lines @@
             focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
 
   // Hitting the return key again; nothing should happen.
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(target.accelerator_count(), 1);
 }
 
 class MessageTrackingView : public View {
  public:
   MessageTrackingView() : accelerator_pressed_(false) {
-  }
+ }
 
   virtual bool OnKeyPressed(const KeyEvent& e) {
     keys_pressed_.push_back(e.key_code());
     return true;
   }
 
   virtual bool OnKeyReleased(const KeyEvent& e) {
     keys_released_.push_back(e.key_code());
     return true;
   }
@@ skipping 192 matching lines @@
     }
 
     DtorTrackVector* dtor_tracker_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(FocusManagerDtorTracked);
   };
 
   class TestFocusManagerFactory : public FocusManagerFactory {
    public:
-    explicit TestFocusManagerFactory(DtorTrackVector* dtor_tracker)
+    TestFocusManagerFactory(DtorTrackVector* dtor_tracker)
         : dtor_tracker_(dtor_tracker) {
     }
 
     FocusManager* CreateFocusManager(Widget* widget) OVERRIDE {
       return new FocusManagerDtorTracked(widget, dtor_tracker_);
     }
 
    private:
     DtorTrackVector* dtor_tracker_;
     DISALLOW_COPY_AND_ASSIGN(TestFocusManagerFactory);
   };
 
   class NativeButtonDtorTracked : public NativeTextButton {
    public:
     NativeButtonDtorTracked(const std::wstring& text,
                             DtorTrackVector* dtor_tracker)
         : NativeTextButton(NULL, text),
           dtor_tracker_(dtor_tracker) {
     };
     virtual ~NativeButtonDtorTracked() {
       dtor_tracker_->push_back("NativeButtonDtorTracked");
     }
 
     DtorTrackVector* dtor_tracker_;
   };
 
   class WindowDtorTracked : public Widget {
    public:
-    explicit WindowDtorTracked(DtorTrackVector* dtor_tracker)
+    WindowDtorTracked(DtorTrackVector* dtor_tracker)
         : dtor_tracker_(dtor_tracker) {
     }
 
     virtual ~WindowDtorTracked() {
       dtor_tracker_->push_back("WindowDtorTracked");
     }
 
     DtorTrackVector* dtor_tracker_;
   };
 
@@ skipping 42 matching lines @@
   ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 }  // namespace views