chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java ('k') | chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java

diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java

index c0b4ca6d387c5f557556a1be3081d7882064d000..b5586040af2df7f1256514c8b0537db32570a9a3 100644

--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java

+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java

@@ -4,9 +4,12 @@

package org.chromium.chrome.browser.sync;

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

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

import android.util.Pair;

+import org.json.JSONException;

+import org.json.JSONObject;

import org.chromium.base.ThreadUtils;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.RetryOnFailure;

@@ -18,8 +21,6 @@ import org.chromium.components.sync.ModelType;

import org.chromium.components.sync.protocol.BookmarkSpecifics;

import org.chromium.components.sync.protocol.SyncEntity;

import org.chromium.content.browser.test.util.Criteria;

-import org.json.JSONException;

-import org.json.JSONObject;

import java.util.ArrayList;

import java.util.List;