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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableBookmarksEditingUnitTest.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.net.Uri; 7 import android.net.Uri;
8 import android.os.Bundle; 8 import android.os.Bundle;
9 import android.test.suitebuilder.annotation.SmallTest; 9 import android.support.test.filters.SmallTest;
10 10
11 import org.chromium.base.ThreadUtils; 11 import org.chromium.base.ThreadUtils;
12 import org.chromium.base.test.util.Feature; 12 import org.chromium.base.test.util.Feature;
13 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz ationsProvider; 13 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz ationsProvider;
14 14
15 /** 15 /**
16 * Unit tests for the partner disabling bookmarks editing functionality. 16 * Unit tests for the partner disabling bookmarks editing functionality.
17 */ 17 */
18 public class PartnerDisableBookmarksEditingUnitTest 18 public class PartnerDisableBookmarksEditingUnitTest
19 extends BasePartnerBrowserCustomizationUnitTest { 19 extends BasePartnerBrowserCustomizationUnitTest {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 assertFalse(PartnerBrowserCustomizations.isBookmarksEditingDisabled()); 134 assertFalse(PartnerBrowserCustomizations.isBookmarksEditingDisabled());
135 135
136 PartnerBrowserCustomizations.setOnInitializeAsyncFinished(mCallback, 300 0); 136 PartnerBrowserCustomizations.setOnInitializeAsyncFinished(mCallback, 300 0);
137 137
138 mCallbackLock.acquire(); 138 mCallbackLock.acquire();
139 139
140 assertTrue(PartnerBrowserCustomizations.isInitialized()); 140 assertTrue(PartnerBrowserCustomizations.isInitialized());
141 assertTrue(PartnerBrowserCustomizations.isBookmarksEditingDisabled()); 141 assertTrue(PartnerBrowserCustomizations.isBookmarksEditingDisabled());
142 } 142 }
143 } 143 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698