Revert of 🔍 Don't display the search engine until First Run completes

chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.searchwidget;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
 import android.content.Context;
@@ skipping 10 matching lines @@
 import org.junit.Assert;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.CommandLineFlags;
 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.util.IntentUtils;
-import org.chromium.chrome.test.util.ApplicationTestUtils;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Tests for the SearchWidgetProvider.
  */
 @CommandLineFlags.Add(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
 public class SearchWidgetProviderTest extends InstrumentationTestCase {
@@ skipping 41 matching lines @@
     private static final String TEXT_GENERIC = "Search";
     private static final String TEXT_SEARCH_ENGINE = "Stuff and Thangs";
     private static final String TEXT_SEARCH_ENGINE_FULL = "Search with Stuff and Thangs";
 
     private TestContext mContext;
     private TestDelegate mDelegate;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        ApplicationTestUtils.setUp(getInstrumentation().getTargetContext(), true);
         SearchActivity.disableForTests();
 
         mContext = new TestContext();
         mDelegate = new TestDelegate(mContext);
         SearchWidgetProvider.setDelegateForTest(mDelegate);
     }
 
-    @Override
-    public void tearDown() throws Exception {
-        ApplicationTestUtils.tearDown(getInstrumentation().getTargetContext());
-        super.tearDown();
-    }
-
     @SmallTest
     public void testUpdateAll() {
         SearchWidgetProvider.handleAction(
                 new Intent(SearchWidgetProvider.ACTION_UPDATE_ALL_WIDGETS));
 
         // Without any idea of what the default search engine is, widgets should default to saying
         // just "Search".
         checkWidgetStates(TEXT_GENERIC, View.VISIBLE);
 
         // The microphone icon should disappear if voice queries are unavailable.
         mDelegate.mViews.clear();
         SearchWidgetProvider.updateCachedVoiceSearchAvailability(false);
         checkWidgetStates(TEXT_GENERIC, View.GONE);
 
         // After recording that the default search engine is "X", it should say "Search with X".
         mDelegate.mViews.clear();
         SearchWidgetProvider.updateCachedEngineName(TEXT_SEARCH_ENGINE);
         checkWidgetStates(TEXT_SEARCH_ENGINE_FULL, View.GONE);
 
         // The microphone icon should appear if voice queries are available.
         mDelegate.mViews.clear();
         SearchWidgetProvider.updateCachedVoiceSearchAvailability(true);
         checkWidgetStates(TEXT_SEARCH_ENGINE_FULL, View.VISIBLE);
     }
 
-    @SmallTest
-    @CommandLineFlags.Remove(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
-    public void testUpdateCachedEngineNameBeforeFirstRun() {
-        assertFalse(SearchWidgetProvider.shouldShowFullString());
-        SearchWidgetProvider.handleAction(
-                new Intent(SearchWidgetProvider.ACTION_UPDATE_ALL_WIDGETS));
-
-        // Without any idea of what the default search engine is, widgets should default to saying
-        // just "Search".
-        checkWidgetStates(TEXT_GENERIC, View.VISIBLE);
-
-        // Until First Run is complete, no search engine branding should be displayed.  Widgets are
-        // already displaying the generic string, and should continue doing so, so they don't get
-        // updated.
-        mDelegate.mViews.clear();
-        SearchWidgetProvider.updateCachedEngineName(TEXT_SEARCH_ENGINE);
-        assertEquals(0, mDelegate.mViews.size());
-
-        // Manually set the preference, then update the cached engine name again.  The
-        // SearchWidgetProvider should now believe that its widgets are displaying branding when it
-        // isn't allowed to, then update them.
-        mDelegate.mViews.clear();
-        mDelegate.getSharedPreferences()
-                .edit()
-                .putString(SearchWidgetProvider.PREF_SEARCH_ENGINE_SHORTNAME, TEXT_SEARCH_ENGINE)
-                .apply();
-        SearchWidgetProvider.updateCachedEngineName(TEXT_SEARCH_ENGINE);
-        checkWidgetStates(TEXT_GENERIC, View.VISIBLE);
-    }
-
     private void checkWidgetStates(final String expectedString, final int expectedMicrophoneState) {
         // Confirm that all the widgets got updated.
         Assert.assertEquals(TestDelegate.ALL_IDS.length, mDelegate.mViews.size());
         for (int i = 0; i < TestDelegate.ALL_IDS.length; i++) {
             Assert.assertEquals(TestDelegate.ALL_IDS[i], mDelegate.mViews.get(i).first.intValue());
         }
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ skipping 102 matching lines @@
         boolean exceptionWasThrown = false;
         try {
             SearchWidgetProvider.run(crashingRunnable);
         } catch (Exception e) {
             exceptionWasThrown = true;
         }
         Assert.assertEquals(3, SearchWidgetProvider.getNumConsecutiveCrashes(prefs));
         Assert.assertTrue(exceptionWasThrown);
     }
 }