| Index: chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java
|
| index c7f970fbf6d8264cfd12afaff37eebd9623f676e..5429068de059ad04db65728d2e5963ffd82c92e0 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java
|
| @@ -27,6 +27,7 @@ import org.chromium.base.test.util.InMemorySharedPreferences;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.ChromeSwitches;
|
| import org.chromium.chrome.browser.firstrun.FirstRunActivity;
|
| +import org.chromium.chrome.browser.searchwidget.SearchActivity.SearchActivityDelegate;
|
| import org.chromium.chrome.browser.util.IntentUtils;
|
| import org.chromium.chrome.test.util.ApplicationTestUtils;
|
| import org.chromium.content.browser.test.util.CriteriaHelper;
|
| @@ -39,6 +40,13 @@ import java.util.List;
|
| */
|
| @CommandLineFlags.Add(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
|
| public class SearchWidgetProviderTest extends InstrumentationTestCase {
|
| + private static class TestSearchDelegate extends SearchActivityDelegate {
|
| + @Override
|
| + public boolean isActivityDisabledForTests() {
|
| + return true;
|
| + }
|
| + }
|
| +
|
| private static final class TestDelegate
|
| extends SearchWidgetProvider.SearchWidgetProviderDelegate {
|
| public static final int[] ALL_IDS = {11684, 20170525};
|
| @@ -91,11 +99,11 @@ public class SearchWidgetProviderTest extends InstrumentationTestCase {
|
| public void setUp() throws Exception {
|
| super.setUp();
|
| ApplicationTestUtils.setUp(getInstrumentation().getTargetContext(), true);
|
| - SearchActivity.disableForTests();
|
| + SearchActivity.setDelegateForTests(new TestSearchDelegate());
|
|
|
| mContext = new TestContext();
|
| mDelegate = new TestDelegate(mContext);
|
| - SearchWidgetProvider.setDelegateForTest(mDelegate);
|
| + SearchWidgetProvider.setActivityDelegateForTest(mDelegate);
|
| }
|
|
|
| @Override
|
|
|