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

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java

 // Copyright 2015 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.firstrun;
 
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
 import org.chromium.chrome.browser.util.IntentUtils;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
 /**
  * Handles the First Run Experience sequences shown to the user launching Chrome for the first time.
  * It supports only a simple format of FRE:
  *   [Welcome]
  *   [Intro pages...]
  *   [Sign-in page]
  * The activity might be run more than once, e.g. 1) for ToS and sign-in, and 2) for intro.
  */
 public class FirstRunActivity extends AsyncInitializationActivity implements FirstRunPageDelegate {
-    /** Alerted about various events when FirstRunActivity performs them. */
-    public interface FirstRunActivityObserver {
-        /** See {@link #onFlowIsKnown}. */
-        void onFlowIsKnown();
-
-        /** See {@link #acceptTermsOfService}. */
-        void onAcceptTermsOfService();
-
-        /** See {@link #jumpToPage}. */
-        void onJumpToPage(int position);
-
-        /** Called when First Run is completed. */
-        void onUpdateCachedEngineName();
-
-        /** See {@link #abortFirstRunExperience}. */
-        void onAbortFirstRunExperience();
-    }
-
     protected static final String TAG = "FirstRunActivity";
 
     // Incoming parameters:
     public static final String EXTRA_COMING_FROM_CHROME_ICON = "Extra.ComingFromChromeIcon";
     public static final String EXTRA_USE_FRE_FLOW_SEQUENCER = "Extra.UseFreFlowSequencer";
     public static final String EXTRA_START_LIGHTWEIGHT_FRE = "Extra.StartLightweightFRE";
     public static final String EXTRA_CHROME_LAUNCH_INTENT = "Extra.FreChromeLaunchIntent";
     public static final String EXTRA_FINISH_ON_TOUCH_OUTSIDE = "Extra.FreFinishOnTouchOutside";
 
     static final String SHOW_WELCOME_PAGE = "ShowWelcome";
@@ skipping 29 matching lines @@
     private static final int FRE_PROGRESS_COMPLETED_NOT_SIGNED_IN = 5;
     private static final int FRE_PROGRESS_MAX = 6;
     private static final EnumeratedHistogramSample sMobileFreProgressMainIntentHistogram =
             new EnumeratedHistogramSample("MobileFre.Progress.MainIntent", FRE_PROGRESS_MAX);
     private static final EnumeratedHistogramSample sMobileFreProgressViewIntentHistogram =
             new EnumeratedHistogramSample("MobileFre.Progress.ViewIntent", FRE_PROGRESS_MAX);
 
     @VisibleForTesting
     static FirstRunGlue sGlue = new FirstRunGlueImpl();
 
-    private static FirstRunActivityObserver sObserver;
-
     private boolean mShowWelcomePage = true;
 
     private String mResultSignInAccountName;
     private boolean mResultShowSignInSettings;
 
     private boolean mFlowIsKnown;
     private boolean mPostNativePageSequenceCreated;
     private boolean mNativeSideIsInitialized;
     private Set<FirstRunPage> mPagesToNotifyOfNativeInit;
     private boolean mDeferredCompleteFRE;
@@ skipping 126 matching lines @@
 
                 mPagerAdapter =
                         new FirstRunPagerAdapter(getFragmentManager(), mPages, mFreProperties);
                 stopProgressionIfNotAcceptedTermsOfService();
                 mPager.setAdapter(mPagerAdapter);
 
                 if (mNativeSideIsInitialized) {
                     skipPagesIfNecessary();
                 }
 
-                if (sObserver != null) sObserver.onFlowIsKnown();
                 recordFreProgressHistogram(mFreProgressStates.get(0));
             }
         };
         mFirstRunFlowSequencer.start();
 
         recordFreProgressHistogram(FRE_PROGRESS_STARTED);
     }
 
     @Override
     public void finishNativeInitialization() {
@@ skipping 130 matching lines @@
     }
 
     @Override
     public void abortFirstRunExperience() {
         Intent intent = new Intent();
         if (mFreProperties != null) intent.putExtras(mFreProperties);
         intent.putExtra(RESULT_CLOSE_APP, true);
         finishAllTheActivities(getLocalClassName(), Activity.RESULT_CANCELED, intent);
 
         sendPendingIntentIfNecessary(false);
-        if (sObserver != null) sObserver.onAbortFirstRunExperience();
     }
 
     @Override
     public void completeFirstRunExperience() {
         if (!mNativeSideIsInitialized) {
             mDeferredCompleteFRE = true;
             return;
         }
         if (!TextUtils.isEmpty(mResultSignInAccountName)) {
             boolean defaultAccountName =
@@ skipping 31 matching lines @@
                 DataReductionProxyUma
                         .dataReductionProxyUIAction(DataReductionProxyUma.ACTION_FRE_DISABLED);
                 DataReductionPromoUtils.saveFrePromoOptOut(true);
             }
         }
 
         Intent resultData = new Intent();
         resultData.putExtras(mFreProperties);
         finishAllTheActivities(getLocalClassName(), Activity.RESULT_OK, resultData);
 
-        // Update the search engine name cached by the widget.
-        SearchWidgetProvider.updateCachedEngineName();
-        if (sObserver != null) sObserver.onUpdateCachedEngineName();
-
         sendPendingIntentIfNecessary(true);
     }
 
     @Override
     public void refuseSignIn() {
         sSigninChoiceHistogram.record(SIGNIN_NO_THANKS);
         mResultSignInAccountName = null;
         mResultShowSignInSettings = false;
     }
 
     @Override
     public void acceptSignIn(String accountName) {
         mResultSignInAccountName = accountName;
     }
 
     @Override
     public void askToOpenSignInSettings() {
         mResultShowSignInSettings = true;
     }
 
     @Override
     public boolean didAcceptTermsOfService() {
-        boolean result = sGlue.didAcceptTermsOfService(getApplicationContext());
-        if (sObserver != null) sObserver.onAcceptTermsOfService();
-        return result;
+        return sGlue.didAcceptTermsOfService(getApplicationContext());
     }
 
     @Override
     public void acceptTermsOfService(boolean allowCrashUpload) {
         // If default is true then it corresponds to opt-out and false corresponds to opt-in.
         UmaUtils.recordMetricsReportingDefaultOptIn(!DEFAULT_METRICS_AND_CRASH_REPORTING);
         sGlue.acceptTermsOfService(allowCrashUpload);
         FirstRunStatus.setSkipWelcomePage(true);
         flushPersistentData();
         stopProgressionIfNotAcceptedTermsOfService();
@@ skipping 61 matching lines @@
             Log.e(TAG, "Unable to send PendingIntent.", e);
         }
     }
 
     /**
      * Transitions to a given page.
      * @return Whether the transition to a given page was allowed.
      * @param position A page index to transition to.
      */
     private boolean jumpToPage(int position) {
-        if (sObserver != null) sObserver.onJumpToPage(position);
-
         if (mShowWelcomePage && !didAcceptTermsOfService()) {
             return position == 0;
         }
         if (position >= mPagerAdapter.getCount()) {
             completeFirstRunExperience();
             return false;
         }
         mPager.setCurrentItem(position, false);
         recordFreProgressHistogram(mFreProgressStates.get(position));
         return true;
@@ skipping 37 matching lines @@
                 return constructor.newInstance();
             }
         };
     }
 
     @Override
     public void showInfoPage(int url) {
         CustomTabActivity.showInfoPage(this, getString(url));
     }
 
+    /** Returns whether or not First Run is ready for interaction. */
     @VisibleForTesting
-    public static void setObserverForTest(FirstRunActivityObserver observer) {
-        assert sObserver == null;
-        sObserver = observer;
+    public boolean isPostNativePageSequenceCreated() {
+        return mPostNativePageSequenceCreated;
     }
 }