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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtilsTest.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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.multiwindow; 5 package org.chromium.chrome.browser.multiwindow;
6 6
7 import android.annotation.TargetApi; 7 import android.annotation.TargetApi;
8 import android.app.Activity; 8 import android.app.Activity;
9 import android.content.Intent; 9 import android.content.Intent;
10 import android.os.Build; 10 import android.os.Build;
11 import android.test.suitebuilder.annotation.SmallTest; 11 import android.support.test.filters.SmallTest;
12 12
13 import org.chromium.base.ActivityState; 13 import org.chromium.base.ActivityState;
14 import org.chromium.base.ApplicationStatus; 14 import org.chromium.base.ApplicationStatus;
15 import org.chromium.base.test.util.Feature; 15 import org.chromium.base.test.util.Feature;
16 import org.chromium.base.test.util.MinAndroidSdkLevel; 16 import org.chromium.base.test.util.MinAndroidSdkLevel;
17 import org.chromium.chrome.R; 17 import org.chromium.chrome.R;
18 import org.chromium.chrome.browser.ChromeTabbedActivity; 18 import org.chromium.chrome.browser.ChromeTabbedActivity;
19 import org.chromium.chrome.browser.ChromeTabbedActivity2; 19 import org.chromium.chrome.browser.ChromeTabbedActivity2;
20 import org.chromium.chrome.browser.IntentHandler; 20 import org.chromium.chrome.browser.IntentHandler;
21 import org.chromium.chrome.test.ChromeTabbedActivityTestBase; 21 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 Activity runningActivity = reference.get(); 187 Activity runningActivity = reference.get();
188 if (runningActivity == null) continue; 188 if (runningActivity == null) continue;
189 if (runningActivity.getClass().equals(ChromeTabbedActivity2.class)) { 189 if (runningActivity.getClass().equals(ChromeTabbedActivity2.class)) {
190 returnActivity = (ChromeTabbedActivity2) runningActivity; 190 returnActivity = (ChromeTabbedActivity2) runningActivity;
191 } 191 }
192 } 192 }
193 assertTrue(returnActivity != null); 193 assertTrue(returnActivity != null);
194 return returnActivity; 194 return returnActivity;
195 } 195 }
196 } 196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698