Show DRP promo on second run

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.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;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ skipping 383 matching lines @@
 
     @Override
     public void finishNativeInitialization() {
         try {
             TraceEvent.begin("ChromeTabbedActivity.finishNativeInitialization");
 
             refreshSignIn();
 
             ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
             // Promos can only be shown when we start with ACTION_MAIN intent and
-            // after FRE is complete.
-            if (!mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()) {
-                // Only show promos on the second oppurtunity. This is because we show FRE on the
-                // first oppurtunity, and we don't want to show such content back to back.
-                if (preferenceManager.getPromosSkippedOnFirstStart()) {
-                    // Data reduction promo should be temporarily suppressed if the sign in promo is
-                    // shown to avoid nagging users too much.
-                    if (!SigninPromoUtil.launchSigninPromoIfNeeded(this)) {
-                        DataReductionPromoScreen.launchDataReductionPromo(this);
-                    }
-                } else {
-                    preferenceManager.setPromosSkippedOnFirstStart(true);
+            // after FRE is complete. Native initialization can finish before the FRE flow is
+            // complete, and this will only show promos on the second opportunity. This is because
+            // the FRE is shown on the first opportunity, and we don't want to show such content
+            // back to back.
+            if (!mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
+                    && preferenceManager.getPromosSkippedOnFirstStart()) {
+                // Data reduction promo should be temporarily suppressed if the sign in promo is
+                // shown to avoid nagging users too much.
+                if (!SigninPromoUtil.launchSigninPromoIfNeeded(this)) {
+                    DataReductionPromoScreen.launchDataReductionPromo(this);
                 }
+            } else {
+                preferenceManager.setPromosSkippedOnFirstStart(true);
             }
 
             initializeUI();
 
             // The dataset has already been created, we need to initialize our state.
             mTabModelSelectorImpl.notifyChanged();
 
             ApiCompatibilityUtils.setWindowIndeterminateProgress(getWindow());
 
             // Check for incognito tabs to handle the case where Chrome was swiped away in the
@@ skipping 1561 matching lines @@
 
         ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         for (AppTask task : manager.getAppTasks()) {
             RecentTaskInfo info = DocumentUtils.getTaskInfoFromTask(task);
             if (info == null) continue;
             if (info.id == sMergedInstanceTaskId) return true;
         }
         return false;
     }
 }