[First Run][Android] Extract FreIntentCreator.createInternal

This CL simplifies the code in FreIntentCreator by using better suited
Intent ctors and by moving addPendingIntent calls to create method.
Also, createInternal method is extracted so subclasses can override it.

Bug: 942175
Change-Id: Ifb95fce6597739c59e925e865b693eda46841f6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1538497Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644743}

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

@@ -42,57 +42,59 @@ public class FreIntentCreator {
                 ? fromIntent
                 : WebappLauncherActivity.createRelaunchWebApkIntent(fromIntent, webApkInfo);
 
+        Intent result = createInternal(caller, fromIntent, preferLightweightFre, webApkInfo);
+        addPendingIntent(caller, result, intentToLaunchAfterFreComplete, requiresBroadcast);
+        return result;
+    }
+
+    /**
+     * Selects one specific FRE implementation and creates an intent to launch this implementation.
+     * Called by {@link #create} that also adds some final touches to the returned intent.
+     *
+     * @param caller               Activity instance that is requesting the first run.
+     * @param fromIntent           Intent used to launch the caller.
+     * @param preferLightweightFre Whether to prefer the Lightweight First Run Experience.
+     * @param webApkInfo           An optional WebApkInfo if this FRE flow was triggered
+     *                             by launching a WebAPK.
+     * @return Intent to launch First Run Experience.
+     */
+    protected Intent createInternal(Context caller, Intent fromIntent, boolean preferLightweightFre,
+            @Nullable WebApkInfo webApkInfo) {
         // Launch the Generic First Run Experience if it was previously active.
         boolean isGenericFreActive = checkIsGenericFreActive();
         if (preferLightweightFre && !isGenericFreActive) {
-            return createLightweightFirstRunIntent(caller, fromIntent, webApkInfo,
-                    intentToLaunchAfterFreComplete, requiresBroadcast);
+            return createLightweightFirstRunIntent(caller, webApkInfo);
         } else {
-            return createGenericFirstRunIntent(
-                    caller, fromIntent, intentToLaunchAfterFreComplete, requiresBroadcast);
+            return createGenericFirstRunIntent(caller, fromIntent);
         }
     }
 
     /**
      * Returns an intent to show the lightweight first run activity.
      * @param context                        The context.
-     * @param fromIntent                     The intent that was used to launch Chrome.
      * @param webApkInfo                     An optional WebApkInfo if this FRE flow was triggered
      *                                       by launching a WebAPK.
-     * @param intentToLaunchAfterFreComplete The intent to launch when the user completes the FRE.
-     * @param requiresBroadcast              Whether the relaunch intent must be broadcasted.
      */
-    private static Intent createLightweightFirstRunIntent(Context context, Intent fromIntent,
-            @Nullable WebApkInfo webApkInfo, Intent intentToLaunchAfterFreComplete,
-            boolean requiresBroadcast) {
-        Intent intent = new Intent();
-        intent.setClassName(context, LightweightFirstRunActivity.class.getName());
+    private static Intent createLightweightFirstRunIntent(
+            Context context, @Nullable WebApkInfo webApkInfo) {
+        Intent intent = new Intent(context, LightweightFirstRunActivity.class);
         String webApkShortName = webApkInfo == null ? null : webApkInfo.shortName();
         if (webApkShortName != null) {
             intent.putExtra(LightweightFirstRunActivity.EXTRA_ASSOCIATED_APP_NAME, webApkShortName);
         }
-        addPendingIntent(context, intent, intentToLaunchAfterFreComplete, requiresBroadcast);
         return intent;
     }
 
     /**
-     * @return A generic intent to show the First Run Activity.
+     * Returns a generic intent to show the First Run Activity.
      * @param context                        The context.
      * @param fromIntent                     The intent that was used to launch Chrome.
-     * @param intentToLaunchAfterFreComplete The intent to launch when the user completes the FRE.
-     * @param requiresBroadcast              Whether the relaunch intent must be broadcasted.
      */
-    private static Intent createGenericFirstRunIntent(Context context, Intent fromIntent,
-            Intent intentToLaunchAfterFreComplete, boolean requiresBroadcast) {
-        final Class<?> activityClass;
-        if (shouldSwitchToTabbedMode(context)) {
-            activityClass = TabbedModeFirstRunActivity.class;
-        } else {
-            activityClass = FirstRunActivity.class;
-        }
-
-        Intent intent = new Intent();
-        intent.setClass(context, activityClass);
+    private static Intent createGenericFirstRunIntent(Context context, Intent fromIntent) {
+        Class<?> activityClass = shouldSwitchToTabbedMode(context)
+                ? TabbedModeFirstRunActivity.class
+                : FirstRunActivity.class;
+        Intent intent = new Intent(context, activityClass);
         intent.putExtra(FirstRunActivity.EXTRA_COMING_FROM_CHROME_ICON,
                 TextUtils.equals(fromIntent.getAction(), Intent.ACTION_MAIN));
         intent.putExtra(FirstRunActivity.EXTRA_CHROME_LAUNCH_INTENT_IS_CCT,
@@ -106,8 +108,6 @@ public class FreIntentCreator {
             intent.putExtra(FirstRunActivity.EXTRA_CHROME_LAUNCH_INTENT_EXTRAS, copiedFromExtras);
         }
 
-        addPendingIntent(context, intent, intentToLaunchAfterFreComplete, requiresBroadcast);
-
         return intent;
     }