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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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.util; 5 package org.chromium.chrome.browser.util;
6 6
7 import android.accounts.Account; 7 import android.accounts.Account;
8 import android.accounts.AuthenticatorDescription; 8 import android.accounts.AuthenticatorDescription;
9 import android.content.Context; 9 import android.content.Context;
10 import android.content.Intent; 10 import android.content.Intent;
11 import android.content.pm.ResolveInfo; 11 import android.content.pm.ResolveInfo;
12 import android.speech.RecognizerIntent; 12 import android.speech.RecognizerIntent;
13 import android.support.test.filters.SmallTest;
13 import android.test.InstrumentationTestCase; 14 import android.test.InstrumentationTestCase;
14 import android.test.mock.MockContext; 15 import android.test.mock.MockContext;
15 import android.test.mock.MockPackageManager; 16 import android.test.mock.MockPackageManager;
16 import android.test.suitebuilder.annotation.SmallTest;
17 17
18 import org.chromium.base.ThreadUtils; 18 import org.chromium.base.ThreadUtils;
19 import org.chromium.base.test.util.AdvancedMockContext; 19 import org.chromium.base.test.util.AdvancedMockContext;
20 import org.chromium.base.test.util.Feature; 20 import org.chromium.base.test.util.Feature;
21 import org.chromium.components.signin.AccountManagerHelper; 21 import org.chromium.components.signin.AccountManagerHelper;
22 import org.chromium.components.signin.test.util.MockAccountManager; 22 import org.chromium.components.signin.test.util.MockAccountManager;
23 23
24 import java.util.ArrayList; 24 import java.util.ArrayList;
25 import java.util.List; 25 import java.util.List;
26 import java.util.concurrent.Callable; 26 import java.util.concurrent.Callable;
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 mAccountTestingContext); 243 mAccountTestingContext);
244 244
245 assertFalse(hasAccounts); 245 assertFalse(hasAccounts);
246 246
247 boolean hasAuthenticator = FeatureUtilities.hasGoogleAccountAuthenticato r( 247 boolean hasAuthenticator = FeatureUtilities.hasGoogleAccountAuthenticato r(
248 mAccountTestingContext); 248 mAccountTestingContext);
249 249
250 assertFalse(hasAuthenticator); 250 assertFalse(hasAuthenticator);
251 } 251 }
252 } 252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698