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

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

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Rebase again :( Created 3 years, 12 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 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.externalnav; 5 package org.chromium.chrome.browser.externalnav;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.app.Instrumentation; 8 import android.app.Instrumentation;
9 import android.app.Instrumentation.ActivityMonitor; 9 import android.app.Instrumentation.ActivityMonitor;
10 import android.content.Context; 10 import android.content.Context;
11 import android.content.Intent; 11 import android.content.Intent;
12 import android.content.IntentFilter; 12 import android.content.IntentFilter;
13 import android.net.Uri; 13 import android.net.Uri;
14 import android.os.SystemClock; 14 import android.os.SystemClock;
15 import android.test.suitebuilder.annotation.SmallTest; 15 import android.support.test.filters.SmallTest;
16 import android.text.TextUtils; 16 import android.text.TextUtils;
17 import android.util.Base64; 17 import android.util.Base64;
18 18
19 import org.chromium.base.test.util.CallbackHelper; 19 import org.chromium.base.test.util.CallbackHelper;
20 import org.chromium.base.test.util.Restriction; 20 import org.chromium.base.test.util.Restriction;
21 import org.chromium.base.test.util.RetryOnFailure; 21 import org.chromium.base.test.util.RetryOnFailure;
22 import org.chromium.chrome.browser.ChromeActivity; 22 import org.chromium.chrome.browser.ChromeActivity;
23 import org.chromium.chrome.browser.document.ChromeLauncherActivity; 23 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
24 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.Overrid eUrlLoadingResult; 24 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.Overrid eUrlLoadingResult;
25 import org.chromium.chrome.browser.tab.EmptyTabObserver; 25 import org.chromium.chrome.browser.tab.EmptyTabObserver;
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 return mActivityMonitor.getHits(); 339 return mActivityMonitor.getHits();
340 } 340 }
341 })); 341 }));
342 } 342 }
343 343
344 @Override 344 @Override
345 public void startMainActivity() throws InterruptedException { 345 public void startMainActivity() throws InterruptedException {
346 startMainActivityOnBlankPage(); 346 startMainActivityOnBlankPage();
347 } 347 }
348 } 348 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698