components/gcm_driver/instance_id/instance_id_android.cc - Issue 1829023002: Add fake for InstanceIDWithSubtype.java, in order to re-use unit test

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: components/gcm_driver/instance_id/instance_id_android.cc

Issue 1829023002: Add fake for InstanceIDWithSubtype.java, in order to re-use unit test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid2jni

Patch Set: Move FakeInstanceIDWithSubtype to javatests/ Created 4 years, 8 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

« components/gcm_driver/instance_id/instance_id_android.h ('K') | « components/gcm_driver/instance_id/instance_id_android.h ('k') | components/gcm_driver/instance_id/instance_id_driver_unittest.cc » ('j') | components/gcm_driver/instance_id/instance_id_driver_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/instance_id/instance_id_android.cc

diff --git a/components/gcm_driver/instance_id/instance_id_android.cc b/components/gcm_driver/instance_id/instance_id_android.cc

index f2fbd212d833d84a676f69a605ef609bcdcaffe1..a60b5de4f060573082e36e09a47840ca8645c4df 100644

--- a/components/gcm_driver/instance_id/instance_id_android.cc

+++ b/components/gcm_driver/instance_id/instance_id_android.cc

@@ -30,6 +30,12 @@ bool InstanceIDAndroid::RegisterJni(JNIEnv* env) {

}

// static

+void InstanceIDAndroid::SetBlockOnAsyncTasksForTesting(bool block) {

+ JNIEnv* env = AttachCurrentThread();

+ Java_InstanceIDBridge_setBlockOnAsyncTasksForTesting(env, block);

+// static

scoped_ptr<InstanceID> InstanceID::Create(const std::string& app_id,

gcm::InstanceIDHandler* unused) {

return make_scoped_ptr(new InstanceIDAndroid(app_id));