Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / autofill / autofill_account_chooser_unittest.mm

diff --git a/src/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm b/src/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
index d9ee006..4e872b0 100644 (file)
--- a/src/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
+++ b/src/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
@@ -13,7 +13,7 @@
 #include "testing/platform_test.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/models/simple_menu_model.h"
-#import "ui/base/test/ui_cocoa_test_helper.h"
+#import "ui/gfx/test/ui_cocoa_test_helper.h"
 
 namespace {
 
@@ -36,19 +36,16 @@ class AutofillAccountChooserTest : public ui::CocoaTest {
 
 class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
-    return false;
-  }
+  bool IsCommandIdChecked(int command_id) const override { return false; }
 
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
-    return true;
-  }
+  bool IsCommandIdEnabled(int command_id) const override { return true; }
 
-  virtual bool GetAcceleratorForCommandId(
-        int command_id,
-        ui::Accelerator* accelerator) OVERRIDE { return false; }
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override {
+    return false;
+  }
 
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {}
+  void ExecuteCommand(int command_id, int event_flags) override {}
 };
 
 }  // namespace
@@ -82,8 +79,8 @@ TEST_F(AutofillAccountChooserTest, PopulatesMenu) {
   using namespace testing;
   MenuDelegate delegate;
   ui::SimpleMenuModel model(&delegate);
-  model.AddItem(1, ASCIIToUTF16("one"));
-  model.AddItem(2, ASCIIToUTF16("two"));
+  model.AddItem(1, base::ASCIIToUTF16("one"));
+  model.AddItem(2, base::ASCIIToUTF16("two"));
 
   EXPECT_CALL(delegate_, MenuModelForAccountChooser())
       .WillOnce(Return(&model));