content/shell/android/browsertests_apk/content_browser_tests_android.cc - Issue 17076008: content_shell: Move BrowserTestSystemMessageHandler and use it in layout tests for Android

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/android/browsertests_apk/content_browser_tests_android.cc

Issue 17076008: content_shell: Move BrowserTestSystemMessageHandler and use it in layout tests for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« no previous file with comments | « content/public/test/nested_message_pump_android.cc ('k') | content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/BrowserTestSystemMessageHandler.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests_apk/content_browser_tests_android.cc

diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc

index fdfde371df4c36941b3dde553615e88f84b665e9..02b7563cbcf63c991d037d58e130ca108431f695 100644

--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc

+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc

@@ -22,10 +22,10 @@

#include "content/public/app/android_library_loader_hooks.h"

#include "content/public/app/content_main.h"

#include "content/public/common/content_switches.h"

+#include "content/public/test/nested_message_pump_android.h"

#include "content/public/test/test_launcher.h"

#include "content/shell/android/shell_jni_registrar.h"

#include "content/shell/app/shell_main_delegate.h"

-#include "content/test/browser_test_message_pump_android.h"

#include "jni/ContentBrowserTestsActivity_jni.h"

#include "testing/android/native_test_util.h"

@@ -105,7 +105,7 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {

if (!content::android::RegisterShellJni(env))

return -1;

- if (!content::BrowserTestMessagePumpAndroid::RegisterJni(env))

+ if (!content::NestedMessagePumpAndroid::RegisterJni(env))

return -1;

if (!content::RegisterNativesImpl(env))