Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2145)

Side by Side Diff: ash/system/chromeos/power/power_event_observer_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/chromeos/power/power_event_observer.h" 5 #include "ash/system/chromeos/power/power_event_observer.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chromeos/dbus/dbus_thread_manager.h" 10 #include "chromeos/dbus/dbus_thread_manager.h"
11 #include "chromeos/dbus/power_manager_client.h" 11 #include "chromeos/dbus/power_manager_client.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 class PowerEventObserverTest : public test::AshTestBase { 15 class PowerEventObserverTest : public test::AshTestBase {
16 public: 16 public:
17 PowerEventObserverTest() {} 17 PowerEventObserverTest() {}
18 virtual ~PowerEventObserverTest() {} 18 virtual ~PowerEventObserverTest() {}
19 19
20 // test::AshTestBase::SetUp() overrides: 20 // test::AshTestBase::SetUp() overrides:
21 virtual void SetUp() OVERRIDE { 21 virtual void SetUp() override {
22 test::AshTestBase::SetUp(); 22 test::AshTestBase::SetUp();
23 observer_.reset(new PowerEventObserver()); 23 observer_.reset(new PowerEventObserver());
24 } 24 }
25 25
26 virtual void TearDown() OVERRIDE { 26 virtual void TearDown() override {
27 observer_.reset(); 27 observer_.reset();
28 test::AshTestBase::TearDown(); 28 test::AshTestBase::TearDown();
29 } 29 }
30 30
31 protected: 31 protected:
32 scoped_ptr<PowerEventObserver> observer_; 32 scoped_ptr<PowerEventObserver> observer_;
33 33
34 private: 34 private:
35 DISALLOW_COPY_AND_ASSIGN(PowerEventObserverTest); 35 DISALLOW_COPY_AND_ASSIGN(PowerEventObserverTest);
36 }; 36 };
(...skipping 24 matching lines...) Expand all
61 61
62 // It also shouldn't request a callback if it isn't instructed to lock the 62 // It also shouldn't request a callback if it isn't instructed to lock the
63 // screen. 63 // screen.
64 observer_->SuspendDone(base::TimeDelta()); 64 observer_->SuspendDone(base::TimeDelta());
65 SetShouldLockScreenBeforeSuspending(false); 65 SetShouldLockScreenBeforeSuspending(false);
66 observer_->SuspendImminent(); 66 observer_->SuspendImminent();
67 EXPECT_EQ(0, client->GetNumPendingSuspendReadinessCallbacks()); 67 EXPECT_EQ(0, client->GetNumPendingSuspendReadinessCallbacks());
68 } 68 }
69 69
70 } // namespace ash 70 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/power_event_observer.h ('k') | ash/system/chromeos/power/power_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698