Remove Document mode promo page from First Run.

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 9efbceda7b22608a5d3fd419094a763598d6c61f..b76966f65a2bd010f2135bfcab93fe9ae0fee89c 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
@@ -47,8 +47,6 @@ public class FirstRunActivity extends ActionBarActivity implements FirstRunPageD
 
     public static final String SHOW_WELCOME_PAGE = "ShowWelcome";
     public static final String SKIP_WELCOME_PAGE_IF_ACCEPTED_TOS = "SkipWelcomePageIfAcceptedToS";
-    public static final String SHOW_INTRO_BITMAP = "ShowIntroBitmap";
-    public static final String SKIP_ALL_INTRO = "SkipAllIntro";  // Marks all intros as seen.
     public static final String SHOW_SIGNIN_PAGE = "ShowSignIn";
 
     // Outcoming results:
@@ -82,7 +80,6 @@ public class FirstRunActivity extends ActionBarActivity implements FirstRunPageD
     private Bundle mFreProperties;
 
     private List<Callable<FirstRunPage>> mPages;
-    private int mSkipIntroPageNumber;
 
     /**
      * The pager adapter, which provides the pages to the view pager widget.
@@ -98,20 +95,6 @@ public class FirstRunActivity extends ActionBarActivity implements FirstRunPageD
         // An optional welcome page.
         if (mShowWelcomePage) mPages.add(pageOf(ToSAndUMAFirstRunFragment.class));
 
-        // An optional sequence of intro pages.
-        if (!mFreProperties.getBoolean(SKIP_ALL_INTRO)) {
-            final long bitmap = mFreProperties.getLong(SHOW_INTRO_BITMAP);
-
-            // "Hera" (recents/tabs) promo.
-            if (((bitmap & FirstRunIntroPage.INTRO_RECENTS) != 0)
-                    && sGlue.isDocumentModeEligible(getApplicationContext())) {
-                mPages.add(pageOf(FirstRunIntroRecentsPage.class));
-            }
-        }
-
-        // Set the anchor to jump to if the user skips intro pages.
-        mSkipIntroPageNumber = mPages.size();
-
         // An optional sign-in page.
         if (mFreProperties.getBoolean(SHOW_SIGNIN_PAGE)) {
             mPages.add(pageOf(AccountFirstRunFragment.class));
@@ -205,8 +188,7 @@ public class FirstRunActivity extends ActionBarActivity implements FirstRunPageD
         super.onStart();
         stopProgressionIfNotAcceptedTermsOfService();
         if (!mFreProperties.getBoolean(USE_FRE_FLOW_SEQUENCER)) {
-            if (FirstRunStatus.getFirstRunFlowComplete(this)
-                    && FirstRunIntroPage.wereAllNecessaryPagesShown(this)) {
+            if (FirstRunStatus.getFirstRunFlowComplete(this)) {
                 // This is a parallel flow that needs to be refreshed/re-fired.
                 // Signal the FRE flow completion and re-launch the original intent.
                 completeFirstRunExperience();
@@ -248,11 +230,6 @@ public class FirstRunActivity extends ActionBarActivity implements FirstRunPageD
     }
 
     @Override
-    public void skipIntroPages() {
-        jumpToPage(mSkipIntroPageNumber, false);
-    }
-
-    @Override
     public void recreateCurrentPage() {
         mPagerAdapter.notifyDataSetChanged();
     }
@@ -435,9 +412,4 @@ public class FirstRunActivity extends ActionBarActivity implements FirstRunPageD
     public void showEmbedContentViewActivity(int title, int url) {
         // TODO(aurimas): implement this once EmbededContentViewActivity is upstreamed.
     }
-
-    @Override
-    public void openDocumentModeSettings() {
-        // TODO(aurimas): implement opening settings once DocumentModeSettings is upstreamed.
-    }
 }