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

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

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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.test.suitebuilder.annotation.SmallTest; 7 import android.support.test.filters.SmallTest;
8 8
9 import org.chromium.base.annotations.SuppressFBWarnings; 9 import org.chromium.base.annotations.SuppressFBWarnings;
10 import org.chromium.base.test.util.CommandLineFlags; 10 import org.chromium.base.test.util.CommandLineFlags;
11 import org.chromium.base.test.util.DisabledTest; 11 import org.chromium.base.test.util.DisabledTest;
12 import org.chromium.base.test.util.Feature; 12 import org.chromium.base.test.util.Feature;
13 import org.chromium.base.test.util.RetryOnFailure; 13 import org.chromium.base.test.util.RetryOnFailure;
14 import org.chromium.content_public.browser.JavaScriptCallback; 14 import org.chromium.content_public.browser.JavaScriptCallback;
15 import org.chromium.content_public.browser.LoadUrlParams; 15 import org.chromium.content_public.browser.LoadUrlParams;
16 import org.chromium.content_public.browser.NavigationController; 16 import org.chromium.content_public.browser.NavigationController;
17 import org.chromium.content_public.browser.WebContents; 17 import org.chromium.content_public.browser.WebContents;
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 275
276 /** 276 /**
277 * Loads data on the UI thread and blocks until onPageFinished is called. 277 * Loads data on the UI thread and blocks until onPageFinished is called.
278 */ 278 */
279 private void loadDataSync(final NavigationController navigationController, f inal String data, 279 private void loadDataSync(final NavigationController navigationController, f inal String data,
280 final String mimeType, final boolean isBase64Encoded) throws Throwab le { 280 final String mimeType, final boolean isBase64Encoded) throws Throwab le {
281 loadUrl(navigationController, mTestCallbackHelperContainer, 281 loadUrl(navigationController, mTestCallbackHelperContainer,
282 LoadUrlParams.createLoadDataParams(data, mimeType, isBase64Encod ed)); 282 LoadUrlParams.createLoadDataParams(data, mimeType, isBase64Encod ed));
283 } 283 }
284 } 284 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698