chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java - Issue 1856753002: GCM: Fix for null Sender ID on 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: chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

Issue 1856753002: GCM: Fix for null Sender ID on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove @Nullable 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java ('k') | components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

index fd50d18c92dba6f20aa6522541cba604e16bd63c..d7af8a3b7e0058e86f60d65467512b9e613b19f2 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

@@ -39,7 +39,6 @@ public class PushMessagingTest

private static final String PUSH_TEST_PAGE =

"/chrome/test/data/push_messaging/push_messaging_test_android.html";

private static final String ABOUT_BLANK = "about:blank";

- private static final String SENDER_ID_BUNDLE_KEY = "from";

private static final int TITLE_UPDATE_TIMEOUT_SECONDS = (int) scaleTimeout(5);

private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chrome";

@@ -174,9 +173,8 @@ public class PushMessagingTest

public void run() {

Context context = getInstrumentation().getTargetContext().getApplicationContext();

Bundle extras = new Bundle();

- extras.putString(SENDER_ID_BUNDLE_KEY, senderId);

PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, context);

- GCMDriver.onMessageReceived(context, appId, extras);

+ GCMDriver.onMessageReceived(context, appId, senderId, extras);

}

});

mMessageHandledHelper.waitForCallback(mMessageHandledHelper.getCallCount());