Revert of Android FRE: A New Deal

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

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
index 148a0047ee3bd1bdc406513cd805a7df60d7f48e..114f708bfb93334c1522d239e84cf10d3c1c668a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
@@ -40,6 +40,9 @@
     protected static final String TAG = "FirstRunActivity";
 
     // Incoming parameters:
+    public static final String ORIGINAL_INTENT = "OriginalIntent";
+    public static final String FIRE_ORIGINAL_INTENT = "FireOriginalIntent";
+    public static final String COMING_FROM_CHROME_ICON = "ComingFromChromeIcon";
     public static final String USE_FRE_FLOW_SEQUENCER = "UseFreFlowSequencer";
 
     public static final String SHOW_WELCOME_PAGE = "ShowWelcome";
@@ -259,6 +262,11 @@
         mFreProperties.putString(RESULT_SIGNIN_ACCOUNT_NAME, mResultSignInAccountName);
         mFreProperties.putBoolean(RESULT_SHOW_SYNC_SETTINGS, mResultShowSyncSettings);
         FirstRunFlowSequencer.markFlowAsCompleted(this, mFreProperties);
+
+        if (mFreProperties.getBoolean(FirstRunActivity.FIRE_ORIGINAL_INTENT)) {
+            Intent originalIntent = mFreProperties.getParcelable(FirstRunActivity.ORIGINAL_INTENT);
+            startActivity(originalIntent);
+        }
 
         Intent resultData = new Intent();
         resultData.putExtras(mFreProperties);