Prefix string16 with base:: in ui/.

ui/views/window/dialog_delegate_unittest.cc

Index: ui/views/window/dialog_delegate_unittest.cc
diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc
index f56073affac3a218209810b278c35a5e30d59728..5398ed08afa3e8447db88359173db51af569465d 100644
--- a/ui/views/window/dialog_delegate_unittest.cc
+++ b/ui/views/window/dialog_delegate_unittest.cc
@@ -38,7 +38,7 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
 
   // DialogDelegateView overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE { return gfx::Size(200, 200); }
-  virtual string16 GetWindowTitle() const OVERRIDE { return title_; }
+  virtual base::string16 GetWindowTitle() const OVERRIDE { return title_; }
 
   // ButtonListener override:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE {
@@ -73,7 +73,7 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
     GetWidget()->Close();
   }
 
-  void set_title(const string16& title) { title_ = title; }
+  void set_title(const base::string16& title) { title_ = title; }
 
  private:
   bool canceled_;
@@ -81,7 +81,7 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
   // Prevent the dialog from closing, for repeated ok and cancel button clicks.
   bool closeable_;
   Button* last_pressed_button_;
-  string16 title_;
+  base::string16 title_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDialog);
 };
@@ -121,21 +121,21 @@ TEST_F(DialogTest, DefaultButtons) {
   dialog()->PressEnterAndCheckStates(ok_button);
 
   // Focus another button in the dialog, it should become the default.
-  LabelButton* button_1 = new LabelButton(dialog(), string16());
+  LabelButton* button_1 = new LabelButton(dialog(), base::string16());
   client_view->AddChildView(button_1);
   client_view->OnWillChangeFocus(ok_button, button_1);
   EXPECT_TRUE(button_1->is_default());
   dialog()->PressEnterAndCheckStates(button_1);
 
   // Focus a Checkbox (not a push button), OK should become the default again.
-  Checkbox* checkbox = new Checkbox(string16());
+  Checkbox* checkbox = new Checkbox(base::string16());
   client_view->AddChildView(checkbox);
   client_view->OnWillChangeFocus(button_1, checkbox);
   EXPECT_FALSE(button_1->is_default());
   dialog()->PressEnterAndCheckStates(ok_button);
 
   // Focus yet another button in the dialog, it should become the default.
-  LabelButton* button_2 = new LabelButton(dialog(), string16());
+  LabelButton* button_2 = new LabelButton(dialog(), base::string16());
   client_view->AddChildView(button_2);
   client_view->OnWillChangeFocus(checkbox, button_2);
   EXPECT_FALSE(button_1->is_default());