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

Side by Side Diff: content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Add presubmit checks 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.content.browser; 5 package org.chromium.content.browser;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.media.AudioManager; 8 import android.media.AudioManager;
9 import android.test.suitebuilder.annotation.MediumTest; 9 import android.support.test.filters.MediumTest;
10 import android.test.suitebuilder.annotation.SmallTest; 10 import android.support.test.filters.SmallTest;
11 11
12 import org.chromium.base.test.util.CommandLineFlags; 12 import org.chromium.base.test.util.CommandLineFlags;
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.Restriction; 15 import org.chromium.base.test.util.Restriction;
16 import org.chromium.base.test.util.RetryOnFailure; 16 import org.chromium.base.test.util.RetryOnFailure;
17 import org.chromium.content.browser.test.util.Criteria; 17 import org.chromium.content.browser.test.util.Criteria;
18 import org.chromium.content.browser.test.util.CriteriaHelper; 18 import org.chromium.content.browser.test.util.CriteriaHelper;
19 import org.chromium.content.browser.test.util.DOMUtils; 19 import org.chromium.content.browser.test.util.DOMUtils;
20 import org.chromium.content.common.ContentSwitches; 20 import org.chromium.content.common.ContentSwitches;
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 376
377 DOMUtils.waitForMediaPauseBeforeEnd(getWebContents(), LONG_AUDIO); 377 DOMUtils.waitForMediaPauseBeforeEnd(getWebContents(), LONG_AUDIO);
378 DOMUtils.waitForMediaPauseBeforeEnd(getWebContents(), LONG_VIDEO); 378 DOMUtils.waitForMediaPauseBeforeEnd(getWebContents(), LONG_VIDEO);
379 379
380 mAudioFocusChangeListener.abandonAudioFocus(); 380 mAudioFocusChangeListener.abandonAudioFocus();
381 381
382 DOMUtils.waitForMediaPlay(getWebContents(), LONG_AUDIO); 382 DOMUtils.waitForMediaPlay(getWebContents(), LONG_AUDIO);
383 DOMUtils.waitForMediaPlay(getWebContents(), LONG_VIDEO); 383 DOMUtils.waitForMediaPlay(getWebContents(), LONG_VIDEO);
384 } 384 }
385 } 385 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698