Index: device/gamepad/gamepad_test_helpers.cc |
diff --git a/content/browser/gamepad/gamepad_test_helpers.cc b/device/gamepad/gamepad_test_helpers.cc |
similarity index 60% |
rename from content/browser/gamepad/gamepad_test_helpers.cc |
rename to device/gamepad/gamepad_test_helpers.cc |
index d5121205b871f1a50d185ad7d118533c29fa8e0f..d27b808586e67f4303621cb09c8a3e2e6b278176 100644 |
--- a/content/browser/gamepad/gamepad_test_helpers.cc |
+++ b/device/gamepad/gamepad_test_helpers.cc |
@@ -2,11 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/browser/gamepad/gamepad_test_helpers.h" |
+#include "device/gamepad/gamepad_test_helpers.h" |
-#include "content/browser/gamepad/gamepad_service.h" |
- |
-namespace content { |
+namespace device { |
MockGamepadDataFetcher::MockGamepadDataFetcher( |
const blink::WebGamepads& test_data) |
@@ -14,8 +12,7 @@ MockGamepadDataFetcher::MockGamepadDataFetcher( |
read_data_(base::WaitableEvent::ResetPolicy::AUTOMATIC, |
base::WaitableEvent::InitialState::NOT_SIGNALED) {} |
-MockGamepadDataFetcher::~MockGamepadDataFetcher() { |
-} |
+MockGamepadDataFetcher::~MockGamepadDataFetcher() {} |
void MockGamepadDataFetcher::GetGamepadData(blink::WebGamepads* pads, |
bool devices_changed_hint) { |
@@ -44,21 +41,30 @@ void MockGamepadDataFetcher::SetTestData(const blink::WebGamepads& new_data) { |
test_data_ = new_data; |
} |
-GamepadTestHelper::GamepadTestHelper() { |
+MockGamepadSharedBuffer::MockGamepadSharedBuffer() { |
+ size_t data_size = sizeof(blink::WebGamepads); |
+ bool res = shared_memory_.CreateAndMapAnonymous(data_size); |
+ CHECK(res); |
+ blink::WebGamepads* buf = buffer(); |
+ memset(buf, 0, sizeof(blink::WebGamepads)); |
} |
-GamepadTestHelper::~GamepadTestHelper() { |
+base::SharedMemory* MockGamepadSharedBuffer::shared_memory() { |
+ return &shared_memory_; |
} |
-GamepadServiceTestConstructor::GamepadServiceTestConstructor( |
- const blink::WebGamepads& test_data) { |
- data_fetcher_ = new MockGamepadDataFetcher(test_data); |
- gamepad_service_ = |
- new GamepadService(std::unique_ptr<GamepadDataFetcher>(data_fetcher_)); |
+blink::WebGamepads* MockGamepadSharedBuffer::buffer() { |
+ void* mem = shared_memory_.memory(); |
+ CHECK(mem); |
+ return static_cast<blink::WebGamepads*>(mem); |
} |
-GamepadServiceTestConstructor::~GamepadServiceTestConstructor() { |
- delete gamepad_service_; |
-} |
+void MockGamepadSharedBuffer::WriteBegin() {} |
+ |
+void MockGamepadSharedBuffer::WriteEnd() {} |
+ |
+GamepadTestHelper::GamepadTestHelper() {} |
+ |
+GamepadTestHelper::~GamepadTestHelper() {} |
-} // namespace content |
+} // namespace device |