chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java - Issue 1234643002: customtabs: Convert to the new AIDL interface, temporarily imported.

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/customtabs/CustomTabActivityTestBase.java

Issue 1234643002: customtabs: Convert to the new AIDL interface, temporarily imported. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added VisibleForTesting to util only used for testing Created 5 years, 5 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

« chrome/android/java/src/android/support/customtabs/CustomTabsIntent.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.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/customtabs/CustomTabActivityTestBase.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java

index 70dd5c98974f968239ffa4800f82e17dfdd1d262..ce034eb5f099d51622cdaeb55152c1064d4b53ac 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java

@@ -9,10 +9,12 @@ import android.app.Instrumentation;

import android.content.ComponentName;

import android.content.Intent;

import android.net.Uri;

+import android.support.customtabs.CustomTabsIntent;

import org.chromium.chrome.browser.DeferredStartupHandler;

import org.chromium.chrome.browser.Tab;

import org.chromium.chrome.browser.document.ChromeLauncherActivity;

+import org.chromium.chrome.browser.util.IntentUtils;

import org.chromium.chrome.test.ChromeActivityTestCaseBase;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

@@ -80,7 +82,7 @@ public abstract class CustomTabActivityTestBase extends

intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

intent.setComponent(new ComponentName(getInstrumentation().getTargetContext(),

ChromeLauncherActivity.class));

- intent.putExtra(CustomTabIntentDataProvider.EXTRA_CUSTOM_TABS_SESSION_ID, -1);

+ IntentUtils.safePutBinderExtra(intent, CustomTabsIntent.EXTRA_SESSION, null);

return intent;

}