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

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

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: 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; 5 package org.chromium.chrome.browser;
6 6
7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E ND_DEVICE; 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E ND_DEVICE;
8 8
9 import android.support.test.filters.LargeTest;
9 import android.test.MoreAsserts; 10 import android.test.MoreAsserts;
10 import android.test.suitebuilder.annotation.LargeTest;
11 11
12 import org.chromium.base.ThreadUtils; 12 import org.chromium.base.ThreadUtils;
13 import org.chromium.base.test.util.DisabledTest; 13 import org.chromium.base.test.util.DisabledTest;
14 import org.chromium.base.test.util.Feature; 14 import org.chromium.base.test.util.Feature;
15 import org.chromium.base.test.util.FlakyTest; 15 import org.chromium.base.test.util.FlakyTest;
16 import org.chromium.base.test.util.Restriction; 16 import org.chromium.base.test.util.Restriction;
17 import org.chromium.base.test.util.RetryOnFailure; 17 import org.chromium.base.test.util.RetryOnFailure;
18 import org.chromium.chrome.browser.prerender.ExternalPrerenderHandler; 18 import org.chromium.chrome.browser.prerender.ExternalPrerenderHandler;
19 import org.chromium.chrome.browser.tab.Tab; 19 import org.chromium.chrome.browser.tab.Tab;
20 import org.chromium.chrome.test.ChromeTabbedActivityTestBase; 20 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 handler.cancelCurrentPrerender(); 142 handler.cancelCurrentPrerender();
143 } 143 }
144 }); 144 });
145 } 145 }
146 146
147 @Override 147 @Override
148 public void startMainActivity() throws InterruptedException { 148 public void startMainActivity() throws InterruptedException {
149 startMainActivityOnBlankPage(); 149 startMainActivityOnBlankPage();
150 } 150 }
151 } 151 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698