chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java - Issue 2801033002: Revert of Android: Remove GetApplicationContext part 2

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/history/HistoryActivityTest.java

Issue 2801033002: Revert of Android: Remove GetApplicationContext part 2 (Closed)

Patch Set: Created 3 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/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.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/history/HistoryActivityTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java

index fd1084e4737e688fd51bf2aa6c57c679a49d37f9..da8f8b6a7c1ff90a377232d36f1209bad9e89356 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java

@@ -196,7 +196,7 @@

@SmallTest

public void testPrivacyDisclaimers_SignedOut() {

- ChromeSigninController signinController = ChromeSigninController.get();

+ ChromeSigninController signinController = ChromeSigninController.get(getActivity());

signinController.setSignedInAccountName(null);

assertEquals(View.GONE, mAdapter.getSignedInNotSyncedViewForTests().getVisibility());

@@ -207,7 +207,7 @@

@SmallTest

public void testPrivacyDisclaimers_SignedIn() {

- ChromeSigninController signinController = ChromeSigninController.get();

+ ChromeSigninController signinController = ChromeSigninController.get(getActivity());

signinController.setSignedInAccountName("test@gmail.com");

setHasOtherFormsOfBrowsingData(false, false);

@@ -222,7 +222,7 @@

@SmallTest

public void testPrivacyDisclaimers_SignedInSynced() {

- ChromeSigninController signinController = ChromeSigninController.get();

+ ChromeSigninController signinController = ChromeSigninController.get(getActivity());

signinController.setSignedInAccountName("test@gmail.com");

setHasOtherFormsOfBrowsingData(false, true);

@@ -237,7 +237,7 @@

@SmallTest

public void testPrivacyDisclaimers_SignedInSyncedAndOtherForms() {

- ChromeSigninController signinController = ChromeSigninController.get();

+ ChromeSigninController signinController = ChromeSigninController.get(getActivity());

signinController.setSignedInAccountName("test@gmail.com");

setHasOtherFormsOfBrowsingData(true, true);