chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java - Issue 2583933003: Replace deprecated Android java test annotations

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/RestoreMigrateTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabModelObserverTest.java » ('j') | chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

index 86546f5ab37e938e99dff8be18855ce15b011788..a3a4b48ab41df49bef460ab02d07e8643e3c6c5f 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

@@ -11,7 +11,7 @@ import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.os.Build;

-import android.test.suitebuilder.annotation.LargeTest;

+import android.support.test.filters.LargeTest;

import org.chromium.base.ActivityState;

import org.chromium.base.ApplicationStatus;