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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.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.partnercustomizations; 5 package org.chromium.chrome.browser.partnercustomizations;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.net.Uri; 8 import android.net.Uri;
9 import android.os.Bundle; 9 import android.os.Bundle;
10 import android.test.suitebuilder.annotation.MediumTest; 10 import android.support.test.filters.MediumTest;
11 import android.view.Menu; 11 import android.view.Menu;
12 import android.view.MenuItem; 12 import android.view.MenuItem;
13 import android.widget.PopupMenu; 13 import android.widget.PopupMenu;
14 14
15 import org.chromium.base.ThreadUtils; 15 import org.chromium.base.ThreadUtils;
16 import org.chromium.base.test.util.Feature; 16 import org.chromium.base.test.util.Feature;
17 import org.chromium.base.test.util.RetryOnFailure; 17 import org.chromium.base.test.util.RetryOnFailure;
18 import org.chromium.chrome.R; 18 import org.chromium.chrome.R;
19 import org.chromium.chrome.browser.preferences.PrefServiceBridge; 19 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
20 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz ationsProvider; 20 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz ationsProvider;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 @Override 166 @Override
167 public Integer call() { 167 public Integer call() {
168 return incognitoTabsCount(); 168 return incognitoTabsCount();
169 } 169 }
170 })); 170 }));
171 } finally { 171 } finally {
172 testServer.stopAndDestroyServer(); 172 testServer.stopAndDestroyServer();
173 } 173 }
174 } 174 }
175 } 175 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698