Fix blank search engine promo on the FRE.

By default the view pager only keeps one page to either
side of the current page, which results in the FRE pages
being regenerated.  This causes the search promo to become
invalid as it has been shown and the user successfully choose
an option.  As a two step mitigation, we up the number of pages
kept to be able to support the current FRE.  Then we also add
additional logic that will just skip the page if it is somehow
able to get into the invalid state again.

BUG=740897

Change-Id: I889900ce20d06248ca95765c54dbc84a60be4f5e
Reviewed-on: https://chromium-review.googlesource.com/567420Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487136}

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

@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.locale.DefaultSearchEngineDialogHelper;
@@ -43,14 +44,16 @@ public class DefaultSearchEngineFirstRunFragment extends FirstRunPage {
 
         assert TemplateUrlService.getInstance().isLoaded();
         mSearchEnginePromoDialoType = LocaleManager.getInstance().getSearchEnginePromoShowType();
-        Runnable dismissRunnable = new Runnable() {
-            @Override
-            public void run() {
-                advanceToNextPage();
-            }
-        };
-        new DefaultSearchEngineDialogHelper(
-                mSearchEnginePromoDialoType, mEngineLayout, mButton, dismissRunnable);
+        if (mSearchEnginePromoDialoType != LocaleManager.SEARCH_ENGINE_PROMO_DONT_SHOW) {
+            Runnable dismissRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    advanceToNextPage();
+                }
+            };
+            new DefaultSearchEngineDialogHelper(
+                    mSearchEnginePromoDialoType, mEngineLayout, mButton, dismissRunnable);
+        }
 
         return rootView;
     }
@@ -58,7 +61,19 @@ public class DefaultSearchEngineFirstRunFragment extends FirstRunPage {
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser) recordShown();
+
+        if (isVisibleToUser) {
+            if (mSearchEnginePromoDialoType == LocaleManager.SEARCH_ENGINE_PROMO_DONT_SHOW) {
+                ThreadUtils.postOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        advanceToNextPage();
+                    }
+                });
+            }
+
+            recordShown();
+        }
     }
 
     private void recordShown() {

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

@@ -239,6 +239,7 @@ public class FirstRunActivity extends AsyncInitializationActivity implements Fir
 
         mPager = new FirstRunViewPager(this);
         mPager.setId(R.id.fre_pager);
+        mPager.setOffscreenPageLimit(3);
         setContentView(mPager);
 
         mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, mFreProperties) {