Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / system / chromeos / power / tray_power_unittest.cc

diff --git a/src/ash/system/chromeos/power/tray_power_unittest.cc b/src/ash/system/chromeos/power/tray_power_unittest.cc
index a5552fa..3678eec 100644 (file)
--- a/src/ash/system/chromeos/power/tray_power_unittest.cc
+++ b/src/ash/system/chromeos/power/tray_power_unittest.cc
@@ -24,11 +24,11 @@ class MockMessageCenter : public message_center::FakeMessageCenter {
   int remove_count() const { return remove_count_; }
 
   // message_center::FakeMessageCenter overrides:
-  virtual void AddNotification(scoped_ptr<Notification> notification) OVERRIDE {
+  virtual void AddNotification(scoped_ptr<Notification> notification) override {
     add_count_++;
   }
   virtual void RemoveNotification(const std::string& id, bool by_user)
-      OVERRIDE {
+      override {
     remove_count_++;
   }
 
@@ -42,7 +42,6 @@ class MockMessageCenter : public message_center::FakeMessageCenter {
 }  // namespace
 
 namespace ash {
-namespace internal {
 
 class TrayPowerTest : public test::AshTestBase {
  public:
@@ -53,13 +52,13 @@ class TrayPowerTest : public test::AshTestBase {
   TrayPower* tray_power() { return tray_power_.get(); }
 
   // test::AshTestBase::SetUp() overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     test::AshTestBase::SetUp();
     message_center_.reset(new MockMessageCenter());
     tray_power_.reset(new TrayPower(NULL, message_center_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     tray_power_.reset();
     message_center_.reset();
     test::AshTestBase::TearDown();
@@ -232,5 +231,4 @@ TEST_F(TrayPowerTest, UpdateNotificationState) {
   EXPECT_EQ(TrayPower::NOTIFICATION_NONE, notification_state());
 }
 
-}  // namespace internal
 }  // namespace ash