content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc - Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc

Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed Android and Unit tests Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« content/browser/gamepad/gamepad_shared_buffer_impl.cc ('K') | « content/browser/renderer_host/pepper/pepper_gamepad_host.h ('k') | content/common/gamepad_user_gesture.h » ('j') | device/gamepad/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc

diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc

index 42ff212bf41759973e23bc4f773a24c13f1fc9f5..f3e2648a4c0edba75119eb067c6638d797ec70fe 100644

--- a/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc

+++ b/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc

@@ -12,9 +12,10 @@

#include "base/macros.h"

#include "base/memory/weak_ptr.h"

#include "build/build_config.h"

-#include "content/browser/gamepad/gamepad_test_helpers.h"

+#include "content/browser/gamepad/gamepad_service_test_helpers.h"

#include "content/browser/renderer_host/pepper/browser_ppapi_host_test.h"

#include "content/common/gamepad_hardware_buffer.h"

+#include "device/gamepad/gamepad_test_helpers.h"

#include "ppapi/c/pp_errors.h"

#include "ppapi/host/host_message_context.h"

#include "ppapi/proxy/gamepad_resource.h"

@@ -151,7 +152,7 @@ TEST_F(PepperGamepadHostTest, MAYBE_WaitForReply) {

gamepad_host.OnResourceMessageReceived(

PpapiHostMsg_Gamepad_RequestMemory(), &context));

- MockGamepadDataFetcher* fetcher = service_->data_fetcher();

+ device::MockGamepadDataFetcher* fetcher = service_->data_fetcher();

fetcher->WaitForDataReadAndCallbacksIssued();

// It should not have sent the callback message.