OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/gamepad/gamepad_test_helpers.h" | 5 #include "content/browser/gamepad/gamepad_test_helpers.h" |
6 | 6 |
7 #include "content/browser/gamepad/gamepad_service.h" | 7 #include "content/browser/gamepad/gamepad_service.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 GamepadTestHelper::GamepadTestHelper() { | 47 GamepadTestHelper::GamepadTestHelper() { |
48 } | 48 } |
49 | 49 |
50 GamepadTestHelper::~GamepadTestHelper() { | 50 GamepadTestHelper::~GamepadTestHelper() { |
51 } | 51 } |
52 | 52 |
53 GamepadServiceTestConstructor::GamepadServiceTestConstructor( | 53 GamepadServiceTestConstructor::GamepadServiceTestConstructor( |
54 const blink::WebGamepads& test_data) { | 54 const blink::WebGamepads& test_data) { |
55 data_fetcher_ = new MockGamepadDataFetcher(test_data); | 55 data_fetcher_ = new MockGamepadDataFetcher(test_data); |
56 gamepad_service_ = | 56 gamepad_service_ = |
57 new GamepadService(scoped_ptr<GamepadDataFetcher>(data_fetcher_)); | 57 new GamepadService(std::unique_ptr<GamepadDataFetcher>(data_fetcher_)); |
58 } | 58 } |
59 | 59 |
60 GamepadServiceTestConstructor::~GamepadServiceTestConstructor() { | 60 GamepadServiceTestConstructor::~GamepadServiceTestConstructor() { |
61 delete gamepad_service_; | 61 delete gamepad_service_; |
62 } | 62 } |
63 | 63 |
64 } // namespace content | 64 } // namespace content |
OLD | NEW |