Implements the Lightweight First Run Experience

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 190e90ab6825b87fc8ef11cf9106ef4c085fb6d4..42697332bfb142acb2a4b8939b41278f6a3d77db 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
@@ -144,6 +144,12 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
             mFreProperties = new Bundle();
         }
 
+        // Skip creating content view if it is a lightweight First Run Experience without using
+        // USE_FRE_FLOW_SEQUENCER.
+        if (!mFreProperties.getBoolean(FirstRunActivity.USE_FRE_FLOW_SEQUENCER)) {
+            return;
+        }
+
         mPager = new ViewPager(this);
         mPager.setId(R.id.fre_pager);
         setContentView(mPager);
@@ -198,7 +204,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mProfileDataCache.destroy();
+        if (mProfileDataCache != null) mProfileDataCache.destroy();
     }
 
     @Override
@@ -360,6 +366,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
     public void acceptTermsOfService(boolean allowCrashUpload) {
         UmaUtils.recordMetricsReportingDefaultOptIn(isMetricsReportingOptIn());
         sGlue.acceptTermsOfService(getApplicationContext(), allowCrashUpload);
+        FirstRunStatus.setSkipWelcomePage(FirstRunActivity.this, true);
         flushPersistentData();
         stopProgressionIfNotAcceptedTermsOfService();
         jumpToPage(mPager.getCurrentItem() + 1, true);
@@ -374,7 +381,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
         if (mNativeSideIsInitialized) ChromeApplication.flushPersistentData();
     }
 
-    private static void finishAllFREActivities(int result, Intent data) {
+    protected static void finishAllFREActivities(int result, Intent data) {
         List<WeakReference<Activity>> activities = ApplicationStatus.getRunningActivities();
         for (WeakReference<Activity> weakActivity : activities) {
             Activity activity = weakActivity.get();