Re-enable DataReductionPromoInfoBar tests and fix flakiness

chrome/android/java/src/org/chromium/chrome/browser/infobar/DataReductionPromoInfoBar.java

 // Copyright 2016 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.infobar;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.os.StrictMode;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.omaha.VersionNumberGetter;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.GURLUtils;
@@ skipping 12 matching lines @@
 public class DataReductionPromoInfoBar extends ConfirmInfoBar {
     private static final String M48_STABLE_RELEASE_DATE = "2016-01-26";
     private static final String ENABLE_INFOBAR_SWITCH = "enable-data-reduction-promo-infobar";
     private static final int NO_INSTALL_TIME = 0;
 
     private static Bitmap sIcon;
     private static String sTitle;
     private static String sText;
     private static String sPrimaryButtonText;
     private static String sSecondaryButtonText;
+
     /**
      * Launch the data reduction infobar promo, if it needs to be displayed.
      *
      * @param context An Android context.
      * @param webContents The WebContents of the tab on which the infobar should show.
      * @param url The URL of the page on which the infobar should show.
      * @param isFragmentNavigation Whether the main frame navigation did not cause changes to the
      *            document (for example scrolling to a named anchor PopState).
      * @param statusCode The HTTP status code of the navigation.
      * @return boolean Whether the promo was launched.
@@ skipping 19 matching lines @@
         if (DataReductionPromoUtils.getDisplayedInfoBarPromo()) return false;
 
         // Only show the promo on HTTP pages.
         if (!GURLUtils.getScheme(url).concat("://").equals(UrlConstants.HTTP_SCHEME)) return false;
 
         int currentMilestone = VersionNumberGetter.getMilestoneFromVersionNumber(
                 PrefServiceBridge.getInstance().getAboutVersionStrings().getApplicationVersion());
         String freOrSecondRunVersion =
                 DataReductionPromoUtils.getDisplayedFreOrSecondRunPromoVersion();
 
-        Calendar releaseDateOfM48Stable = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        releaseDateOfM48Stable.setTime(Date.valueOf(M48_STABLE_RELEASE_DATE));
-        long packageInstallTime = getPackageInstallTime(context);
+        Calendar releaseDateOfM48Stable = null;
 
-        // The boolean pref that stores whether user opted out on the first run experience was
-        // added in M51. If the last promo was shown before M51, then |freOrSecondRunVersion| will
-        // be empty. If Chrome was installed after the FRE promo was added in M48 and before M51,
-        // assume the user opted out from the FRE and don't show the infobar.
-        if (freOrSecondRunVersion.isEmpty()
-                && packageInstallTime > releaseDateOfM48Stable.getTimeInMillis()) {
-            return false;
+        // Temporarily allowing disk access. TODO: Fix. See http://crbug.com/577185
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+        try {
+            releaseDateOfM48Stable = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+

[gone, 2016/07/12 23:28:07]

Moving all of this code into this try block won't address whatever flakiness
you're encountering.  Keep it outside unless you have a strong reason to move it
in.

[megjablon, 2016/07/13 01:03:28]

The flakiness is addressed in the Infobar tests. This is to fix the strict mode
issue. I'm still investigating with Peter how to make strict mode trigger
locally so that I can test and target this better. According to his comment on
the bug, the line below where I do Date.ValueOf makes a disk read too. From a
little investigation I think BitmapFactory.decodeResource might too so that's
why I've included it all in this block.

[gone, 2016/07/13 01:09:04]

Acknowledged.

+            releaseDateOfM48Stable.setTime(Date.valueOf(M48_STABLE_RELEASE_DATE));
+            long packageInstallTime = getPackageInstallTime(context);
+
+            // The boolean pref that stores whether user opted out on the first run experience was
+            // added in M51. If the last promo was shown before M51, then |freOrSecondRunVersion|
+            // will be empty. If Chrome was installed after the FRE promo was added in M48 and
+            // beforeM51,assume the user opted out from the FRE and don't show the infobar.
+            if (freOrSecondRunVersion.isEmpty()
+                    && packageInstallTime > releaseDateOfM48Stable.getTimeInMillis()) {
+                return false;
+            }
+
+            // Only show the promo if the current version is at least two milestones after the last
+            // promo was displayed or the command line switch is on. If the last promo was shown
+            // before M51 then |freOrSecondRunVersion| will be empty and it is safe to show the
+            // infobar promo.
+            if (!CommandLine.getInstance().hasSwitch(ENABLE_INFOBAR_SWITCH)
+                    && !freOrSecondRunVersion.isEmpty()
+                    && currentMilestone < VersionNumberGetter
+                            .getMilestoneFromVersionNumber(freOrSecondRunVersion) + 2) {
+                return false;
+            }
+
+            DataReductionPromoInfoBar.launch(webContents,
+                    BitmapFactory.decodeResource(context.getResources(), R.mipmap.app_icon),
+                    context.getString(R.string.data_reduction_promo_infobar_title),
+                    context.getString(R.string.data_reduction_promo_infobar_text),
+                    context.getString(R.string.data_reduction_promo_infobar_button),
+                    context.getString(R.string.no_thanks));
+
+            return true;
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
         }
-
-        // Only show the promo if the current version is at least two milestones after the last
-        // promo was displayed or the command line switch is on. If the last promo was shown before
-        // M51 then |freOrSecondRunVersion| will be empty and it is safe to show the infobar promo.
-        if (!CommandLine.getInstance().hasSwitch(ENABLE_INFOBAR_SWITCH)
-                && !freOrSecondRunVersion.isEmpty()
-                && currentMilestone < VersionNumberGetter
-                        .getMilestoneFromVersionNumber(freOrSecondRunVersion) + 2) {
-            return false;
-        }
-
-        DataReductionPromoInfoBar.launch(webContents,
-                BitmapFactory.decodeResource(context.getResources(), R.mipmap.app_icon),
-                context.getString(R.string.data_reduction_promo_infobar_title),
-                context.getString(R.string.data_reduction_promo_infobar_text),
-                context.getString(R.string.data_reduction_promo_infobar_button),
-                context.getString(R.string.no_thanks));
-
-        return true;
     }
 
     /**
      * Gets the time at which this app was first installed in milliseconds since January 1, 1970
      * 00:00:00.0 UTC.
      *
      * @param context An Android context.
      * @return The time at which this app was first installed in milliseconds since the epoch or
      *         zero if the time cannot be retrieved.
      */
@@ skipping 37 matching lines @@
         super(0, sIcon, sTitle, null, sPrimaryButtonText, sSecondaryButtonText);
     }
 
     @Override
     public void createContent(InfoBarLayout layout) {
         super.createContent(layout);
         InfoBarControlLayout control = layout.addControlLayout();
         control.addDescription(sText);
     }
 }