Prefix string16 with base:: in ui/.

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 2013 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/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 20 matching lines @@
     canceled_ = true;
     return closeable_;
   }
   virtual bool Accept() OVERRIDE {
     accepted_ = true;
     return closeable_;
   }
 
   // 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 {
     last_pressed_button_ = sender;
   }
 
   Button* last_pressed_button() const { return last_pressed_button_; }
 
   void PressEnterAndCheckStates(Button* button) {
     ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false);
@@ skipping 14 matching lines @@
     accepted_ = false;
     EXPECT_EQ(last_pressed, last_pressed_button_);
     last_pressed_button_ = NULL;
   }
 
   void TearDown() {
     closeable_ = true;
     GetWidget()->Close();
   }
 
-  void set_title(const string16& title) { title_ = title; }
+  void set_title(const base::string16& title) { title_ = title; }
 
  private:
   bool canceled_;
   bool accepted_;
   // 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);
 };
 
 class DialogTest : public ViewsTestBase {
  public:
   DialogTest() : dialog_(NULL) {}
   virtual ~DialogTest() {}
 
   virtual void SetUp() OVERRIDE {
@@ skipping 19 matching lines @@
 
 TEST_F(DialogTest, DefaultButtons) {
   DialogClientView* client_view = dialog()->GetDialogClientView();
   LabelButton* ok_button = client_view->ok_button();
 
   // DialogDelegate's default button (ok) should be default (and handle enter).
   EXPECT_EQ(ui::DIALOG_BUTTON_OK, dialog()->GetDefaultDialogButton());
   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());
   EXPECT_TRUE(button_2->is_default());
   dialog()->PressEnterAndCheckStates(button_2);
 
   // Focus nothing, OK should become the default again.
   client_view->OnWillChangeFocus(button_2, NULL);
   EXPECT_FALSE(button_1->is_default());
   EXPECT_FALSE(button_2->is_default());
@@ skipping 67 matching lines @@
 
   // Giving the default test dialog a title will make the bounds the same.
   dialog()->set_title(ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   View* frame = dialog()->GetWidget()->non_client_view()->frame_view();
   EXPECT_EQ(titled_dialog->GetWidget()->GetWindowBoundsInScreen().height(),
             frame->GetPreferredSize().height());
 }
 
 }  // namespace views