Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Rebase again :( Created 4 years 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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.chrome.browser.signin; 5 package org.chromium.chrome.browser.signin;
6 6
7 import android.accounts.Account; 7 import android.accounts.Account;
8 import android.support.test.filters.SmallTest;
8 import android.test.InstrumentationTestCase; 9 import android.test.InstrumentationTestCase;
9 import android.test.suitebuilder.annotation.SmallTest;
10 10
11 import org.chromium.base.test.util.AdvancedMockContext; 11 import org.chromium.base.test.util.AdvancedMockContext;
12 import org.chromium.base.test.util.DisabledTest; 12 import org.chromium.base.test.util.DisabledTest;
13 import org.chromium.base.test.util.RetryOnFailure; 13 import org.chromium.base.test.util.RetryOnFailure;
14 import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker; 14 import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker;
15 import org.chromium.components.signin.AccountManagerHelper; 15 import org.chromium.components.signin.AccountManagerHelper;
16 import org.chromium.components.signin.ChromeSigninController; 16 import org.chromium.components.signin.ChromeSigninController;
17 import org.chromium.components.signin.test.util.AccountHolder; 17 import org.chromium.components.signin.test.util.AccountHolder;
18 import org.chromium.components.signin.test.util.MockAccountManager; 18 import org.chromium.components.signin.test.util.MockAccountManager;
19 19
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 138 }
139 139
140 private String getSignedInAccountName() { 140 private String getSignedInAccountName() {
141 return ChromeSigninController.get(mContext).getSignedInAccountName(); 141 return ChromeSigninController.get(mContext).getSignedInAccountName();
142 } 142 }
143 143
144 private String getNewSignedInAccountName() { 144 private String getNewSignedInAccountName() {
145 return SigninHelper.getNewSignedInAccountName(mContext); 145 return SigninHelper.getNewSignedInAccountName(mContext);
146 } 146 }
147 } 147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698