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

Side by Side Diff: extensions/shell/browser/shell_desktop_controller_aura_unittest.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller_aura.h" 5 #include "extensions/shell/browser/shell_desktop_controller_aura.h"
6 6
7 #include <memory>
8
7 #include "base/macros.h" 9 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/ptr_util.h"
9 #include "base/time/time.h" 11 #include "base/time/time.h"
10 #include "build/build_config.h" 12 #include "build/build_config.h"
11 #include "ui/aura/test/aura_test_base.h" 13 #include "ui/aura/test/aura_test_base.h"
12 14
13 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
14 #include "chromeos/dbus/dbus_thread_manager.h" 16 #include "chromeos/dbus/dbus_thread_manager.h"
15 #include "chromeos/dbus/fake_power_manager_client.h" 17 #include "chromeos/dbus/fake_power_manager_client.h"
16 #endif 18 #endif
17 19
18 namespace extensions { 20 namespace extensions {
19 21
20 class ShellDesktopControllerAuraTest : public aura::test::AuraTestBase { 22 class ShellDesktopControllerAuraTest : public aura::test::AuraTestBase {
21 public: 23 public:
22 ShellDesktopControllerAuraTest() 24 ShellDesktopControllerAuraTest()
23 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
24 : power_manager_client_(NULL) 26 : power_manager_client_(NULL)
25 #endif 27 #endif
26 { 28 {
27 } 29 }
28 ~ShellDesktopControllerAuraTest() override {} 30 ~ShellDesktopControllerAuraTest() override {}
29 31
30 void SetUp() override { 32 void SetUp() override {
31 #if defined(OS_CHROMEOS) 33 #if defined(OS_CHROMEOS)
32 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = 34 std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
33 chromeos::DBusThreadManager::GetSetterForTesting(); 35 chromeos::DBusThreadManager::GetSetterForTesting();
34 power_manager_client_ = new chromeos::FakePowerManagerClient(); 36 power_manager_client_ = new chromeos::FakePowerManagerClient();
35 dbus_setter->SetPowerManagerClient(make_scoped_ptr(power_manager_client_)); 37 dbus_setter->SetPowerManagerClient(base::WrapUnique(power_manager_client_));
36 #endif 38 #endif
37 aura::test::AuraTestBase::SetUp(); 39 aura::test::AuraTestBase::SetUp();
38 controller_.reset(new ShellDesktopControllerAura()); 40 controller_.reset(new ShellDesktopControllerAura());
39 } 41 }
40 42
41 void TearDown() override { 43 void TearDown() override {
42 controller_.reset(); 44 controller_.reset();
43 aura::test::AuraTestBase::TearDown(); 45 aura::test::AuraTestBase::TearDown();
44 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
45 chromeos::DBusThreadManager::Shutdown(); 47 chromeos::DBusThreadManager::Shutdown();
46 #endif 48 #endif
47 } 49 }
48 50
49 protected: 51 protected:
50 scoped_ptr<ShellDesktopControllerAura> controller_; 52 std::unique_ptr<ShellDesktopControllerAura> controller_;
51 53
52 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
53 chromeos::FakePowerManagerClient* power_manager_client_; // Not owned. 55 chromeos::FakePowerManagerClient* power_manager_client_; // Not owned.
54 #endif 56 #endif
55 57
56 private: 58 private:
57 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAuraTest); 59 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAuraTest);
58 }; 60 };
59 61
60 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
61 // Tests that a shutdown request is sent to the power manager when the power 63 // Tests that a shutdown request is sent to the power manager when the power
62 // button is pressed. 64 // button is pressed.
63 TEST_F(ShellDesktopControllerAuraTest, PowerButton) { 65 TEST_F(ShellDesktopControllerAuraTest, PowerButton) {
64 // Ignore button releases. 66 // Ignore button releases.
65 power_manager_client_->SendPowerButtonEvent(false /* down */, 67 power_manager_client_->SendPowerButtonEvent(false /* down */,
66 base::TimeTicks()); 68 base::TimeTicks());
67 EXPECT_EQ(0, power_manager_client_->num_request_shutdown_calls()); 69 EXPECT_EQ(0, power_manager_client_->num_request_shutdown_calls());
68 70
69 // A button press should trigger a shutdown request. 71 // A button press should trigger a shutdown request.
70 power_manager_client_->SendPowerButtonEvent(true /* down */, 72 power_manager_client_->SendPowerButtonEvent(true /* down */,
71 base::TimeTicks()); 73 base::TimeTicks());
72 EXPECT_EQ(1, power_manager_client_->num_request_shutdown_calls()); 74 EXPECT_EQ(1, power_manager_client_->num_request_shutdown_calls());
73 } 75 }
74 #endif 76 #endif
75 77
76 } // namespace extensions 78 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_aura.cc ('k') | extensions/shell/browser/shell_desktop_controller_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698