| Index: content/browser/gamepad/gamepad_test_helpers.cc
|
| diff --git a/content/browser/gamepad/gamepad_test_helpers.cc b/content/browser/gamepad/gamepad_test_helpers.cc
|
| index e4db14ce0807b3341ba253cdbee4faf864f40e09..8837c8e59c34c20f49b0cd6486732abdd7abe2c3 100644
|
| --- a/content/browser/gamepad/gamepad_test_helpers.cc
|
| +++ b/content/browser/gamepad/gamepad_test_helpers.cc
|
| @@ -9,7 +9,7 @@
|
| namespace content {
|
|
|
| MockGamepadDataFetcher::MockGamepadDataFetcher(
|
| - const WebKit::WebGamepads& test_data)
|
| + const blink::WebGamepads& test_data)
|
| : test_data_(test_data),
|
| read_data_(false, false) {
|
| }
|
| @@ -17,7 +17,7 @@ MockGamepadDataFetcher::MockGamepadDataFetcher(
|
| MockGamepadDataFetcher::~MockGamepadDataFetcher() {
|
| }
|
|
|
| -void MockGamepadDataFetcher::GetGamepadData(WebKit::WebGamepads* pads,
|
| +void MockGamepadDataFetcher::GetGamepadData(blink::WebGamepads* pads,
|
| bool devices_changed_hint) {
|
| {
|
| base::AutoLock lock(lock_);
|
| @@ -30,7 +30,7 @@ void MockGamepadDataFetcher::WaitForDataRead() {
|
| return read_data_.Wait();
|
| }
|
|
|
| -void MockGamepadDataFetcher::SetTestData(const WebKit::WebGamepads& new_data) {
|
| +void MockGamepadDataFetcher::SetTestData(const blink::WebGamepads& new_data) {
|
| base::AutoLock lock(lock_);
|
| test_data_ = new_data;
|
| }
|
| @@ -42,7 +42,7 @@ GamepadTestHelper::~GamepadTestHelper() {
|
| }
|
|
|
| GamepadServiceTestConstructor::GamepadServiceTestConstructor(
|
| - const WebKit::WebGamepads& test_data) {
|
| + const blink::WebGamepads& test_data) {
|
| data_fetcher_ = new MockGamepadDataFetcher(test_data);
|
| gamepad_service_ =
|
| new GamepadService(scoped_ptr<GamepadDataFetcher>(data_fetcher_));
|
|
|