Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / system / chromeos / rotation / tray_rotation_lock_unittest.cc

diff --git a/src/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/src/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index 7a53f9d..c043a06 100644 (file)
--- a/src/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
+++ b/src/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
@@ -53,8 +53,8 @@ class TrayRotationLockTest : public test::AshTestBase {
   void TearDownViews();
 
   // test::AshTestBase:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  private:
   scoped_ptr<TrayRotationLock> tray_;
@@ -83,7 +83,7 @@ void TrayRotationLockTest::SetUp() {
   // The Display used for testing is not an internal display. This flag
   // allows for DisplayManager to treat it as one. TrayRotationLock is only
   // visible on internal primary displays.
-  CommandLine::ForCurrentProcess()->AppendSwitch(
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kAshUseFirstDisplayAsInternal);
   test::AshTestBase::SetUp();
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());