content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java - Issue 1263053002: Move JNI annotations to annotations package.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java

Issue 1263053002: Move JNI annotations to annotations package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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 unified diff | Download patch

« no previous file with comments | « content/shell/android/java/src/org/chromium/content_shell/ShellManager.java ('k') | content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 package org.chromium.content_shell;	5 package org.chromium.content_shell;

6	6

7 import org.chromium.base.CalledByNative;	7 import org.chromium.base.annotations.CalledByNative;

8 import org.chromium.base.JNINamespace;	8 import org.chromium.base.annotations.JNINamespace;

9 import org.chromium.content.browser.ServiceRegistry;	9 import org.chromium.content.browser.ServiceRegistry;

10 import org.chromium.mojo.system.Pair;	10 import org.chromium.mojo.system.Pair;

11	11

12 /**	12 /**

13 * Test hooks for Mojo service support in the browser. See http://crbug.com/4159 45.	13 * Test hooks for Mojo service support in the browser. See http://crbug.com/4159 45.

14 */	14 */

15 @JNINamespace("content")	15 @JNINamespace("content")

16 public class ShellMojoTestUtils {	16 public class ShellMojoTestUtils {

17 public static long setupTestEnvironment() {	17 public static long setupTestEnvironment() {

18 return nativeSetupTestEnvironment();	18 return nativeSetupTestEnvironment();

(...skipping 24 matching lines...) Expand all Loading...
43 public static Pair makePair(ServiceRegistry serviceRegistryA,	43 public static Pair makePair(ServiceRegistry serviceRegistryA,

44 ServiceRegistry serviceRegistryB) {	44 ServiceRegistry serviceRegistryB) {

45 return new Pair<ServiceRegistry, ServiceRegistry>(serviceRegistryA, serv iceRegistryB);	45 return new Pair<ServiceRegistry, ServiceRegistry>(serviceRegistryA, serv iceRegistryB);

46 }	46 }

47	47

48 private static native long nativeSetupTestEnvironment();	48 private static native long nativeSetupTestEnvironment();

49 private static native void nativeTearDownTestEnvironment(long testEnvironmen t);	49 private static native void nativeTearDownTestEnvironment(long testEnvironmen t);

50 private static native Pair nativeCreateServiceRegistryPair(long testEnvironm ent);	50 private static native Pair nativeCreateServiceRegistryPair(long testEnvironm ent);

51 private static native void nativeRunLoop(long timeoutMs);	51 private static native void nativeRunLoop(long timeoutMs);

52 }	52 }

OLD	NEW