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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.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.omnibox; 5 package org.chromium.chrome.browser.omnibox;
6 6
7 import static org.chromium.chrome.test.util.OmniboxTestUtils.buildSuggestionMap; 7 import static org.chromium.chrome.test.util.OmniboxTestUtils.buildSuggestionMap;
8 8
9 import android.os.Build; 9 import android.os.Build;
10 import android.os.SystemClock; 10 import android.os.SystemClock;
11 import android.support.test.filters.MediumTest;
12 import android.support.test.filters.SmallTest;
11 import android.support.v4.view.ViewCompat; 13 import android.support.v4.view.ViewCompat;
12 import android.test.suitebuilder.annotation.MediumTest;
13 import android.test.suitebuilder.annotation.SmallTest;
14 import android.text.Selection; 14 import android.text.Selection;
15 import android.util.Pair; 15 import android.util.Pair;
16 import android.view.KeyEvent; 16 import android.view.KeyEvent;
17 import android.view.View; 17 import android.view.View;
18 import android.view.WindowManager; 18 import android.view.WindowManager;
19 import android.widget.ImageButton; 19 import android.widget.ImageButton;
20 import android.widget.ImageView; 20 import android.widget.ImageView;
21 import android.widget.TextView; 21 import android.widget.TextView;
22 22
23 import org.chromium.base.ThreadUtils; 23 import org.chromium.base.ThreadUtils;
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 754
755 @Override 755 @Override
756 public void startMainActivity() throws InterruptedException { 756 public void startMainActivity() throws InterruptedException {
757 if (getName().equals("testsplitPathFromUrlDisplayText") 757 if (getName().equals("testsplitPathFromUrlDisplayText")
758 || getName().equals("testDefaultText")) { 758 || getName().equals("testDefaultText")) {
759 return; 759 return;
760 } 760 }
761 startMainActivityOnBlankPage(); 761 startMainActivityOnBlankPage();
762 } 762 }
763 } 763 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698