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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.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.chrome.browser.customtabs; 5 package org.chromium.chrome.browser.customtabs;
6 6
7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E ND_DEVICE; 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E ND_DEVICE;
8 8
9 import android.app.Activity; 9 import android.app.Activity;
10 import android.app.Application; 10 import android.app.Application;
(...skipping 14 matching lines...) Expand all
25 import android.os.Build; 25 import android.os.Build;
26 import android.os.Bundle; 26 import android.os.Bundle;
27 import android.os.SystemClock; 27 import android.os.SystemClock;
28 import android.support.customtabs.CustomTabsCallback; 28 import android.support.customtabs.CustomTabsCallback;
29 import android.support.customtabs.CustomTabsClient; 29 import android.support.customtabs.CustomTabsClient;
30 import android.support.customtabs.CustomTabsIntent; 30 import android.support.customtabs.CustomTabsIntent;
31 import android.support.customtabs.CustomTabsService; 31 import android.support.customtabs.CustomTabsService;
32 import android.support.customtabs.CustomTabsServiceConnection; 32 import android.support.customtabs.CustomTabsServiceConnection;
33 import android.support.customtabs.CustomTabsSession; 33 import android.support.customtabs.CustomTabsSession;
34 import android.support.customtabs.CustomTabsSessionToken; 34 import android.support.customtabs.CustomTabsSessionToken;
35 import android.test.suitebuilder.annotation.SmallTest; 35 import android.support.test.filters.SmallTest;
36 import android.text.TextUtils; 36 import android.text.TextUtils;
37 import android.view.Menu; 37 import android.view.Menu;
38 import android.view.MenuItem; 38 import android.view.MenuItem;
39 import android.view.View; 39 import android.view.View;
40 import android.view.ViewGroup; 40 import android.view.ViewGroup;
41 import android.widget.EditText; 41 import android.widget.EditText;
42 import android.widget.ImageButton; 42 import android.widget.ImageButton;
43 43
44 import org.chromium.base.ObserverList.RewindableIterator; 44 import org.chromium.base.ObserverList.RewindableIterator;
45 import org.chromium.base.PathUtils; 45 import org.chromium.base.PathUtils;
(...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after
1861 if (jsonText.equalsIgnoreCase("null")) jsonText = ""; 1861 if (jsonText.equalsIgnoreCase("null")) jsonText = "";
1862 value = jsonText; 1862 value = jsonText;
1863 } catch (InterruptedException | TimeoutException e) { 1863 } catch (InterruptedException | TimeoutException e) {
1864 e.printStackTrace(); 1864 e.printStackTrace();
1865 return false; 1865 return false;
1866 } 1866 }
1867 return TextUtils.equals(mExpected, value); 1867 return TextUtils.equals(mExpected, value);
1868 } 1868 }
1869 } 1869 }
1870 } 1870 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698