content/shell/browser/shell_mojo_test_utils_android.cc - Issue 641703002: Rewrite the Android implementation of BatteryMonitor directly in Java.

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/shell/browser/shell_mojo_test_utils_android.cc

Issue 641703002: Rewrite the Android implementation of BatteryMonitor directly in Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@battery-status-api-to-mojo

Patch Set: Address Ben's comments, update GN build, polish. Created 6 years 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/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java ('K') | « content/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java ('k') | device/battery/BUILD.gn » ('j') | device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_mojo_test_utils_android.cc

diff --git a/content/shell/browser/shell_mojo_test_utils_android.cc b/content/shell/browser/shell_mojo_test_utils_android.cc

index 9ca5a66f264127f289d37d2aca17199cdfb1c1b1..b8c69bd15a46d2b4878ff8b6bbf1719353b218e3 100644

--- a/content/shell/browser/shell_mojo_test_utils_android.cc

+++ b/content/shell/browser/shell_mojo_test_utils_android.cc

@@ -58,8 +58,8 @@ static jobject CreateServiceRegistryPair(JNIEnv* env,

test_environment->wrappers.push_back(wrapper_b);

return Java_ShellMojoTestUtils_makePair(env,

- wrapper_a->GetObjForTesting().obj(),

- wrapper_b->GetObjForTesting().obj())

+ wrapper_a->GetObj().obj(),

+ wrapper_b->GetObj().obj())

.Release();

}