Add Data Reduction Proxy card to Clank FRE in EM

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 40d3d2d0da3e6925db4006562ef40fb29dc153ef..1de4242301ad6abc144d840974a1a115138a5f70 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
@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import org.chromium.base.ApplicationStatus;
+import org.chromium.base.FieldTrialList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.metrics.RecordHistogram;
@@ -21,6 +22,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.EmbedContentViewActivity;
+import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.profiles.Profile;
 
 import java.lang.ref.WeakReference;
@@ -100,6 +102,11 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
         // An optional welcome page.
         if (mShowWelcomePage) mPages.add(pageOf(ToSAndUMAFirstRunFragment.class));
 
+        // An optional Data Saver page.
+        if (FieldTrialList.findFullName("DataReductionProxyFREPromo").equals("Enabled")) {
+            mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
+        }
+
         // An optional sign-in page.
         if (mFreProperties.getBoolean(SHOW_SIGNIN_PAGE)) {
             mPages.add(pageOf(AccountFirstRunFragment.class));
@@ -244,6 +251,8 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
 
     @Override
     public void completeFirstRunExperience() {
+        RecordUserAction.record("MobileFre.FreShown");

[aurimas (slooooooooow), 2015/09/24 20:59:10]

This is already covered by MobileFre.SignInChoice

[megjablon, 2015/09/24 23:40:34]

And this is reported even if the sign in card isn't shown, correct?

[aurimas (slooooooooow), 2015/09/25 23:03:35]

Yes, you can look within this file.

+
         if (!TextUtils.isEmpty(mResultSignInAccountName)) {
             boolean defaultAccountName =
                     sGlue.isDefaultAccountName(getApplicationContext(), mResultSignInAccountName);
@@ -288,6 +297,17 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
             startActivity(originalIntent);
         }
 
+        if (DataReductionProxyFirstRunFragment
+                .getDisplayedDataReductionFreCard(getApplicationContext())) {
+            if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {
+                DataReductionProxyUma
+                        .dataReductionProxyUIAction(DataReductionProxyUma.ACTION_FRE_ENABLED);
+            } else {
+                DataReductionProxyUma
+                        .dataReductionProxyUIAction(DataReductionProxyUma.ACTION_FRE_DISABLED);
+            }
+        }
+
         Intent resultData = new Intent();
         resultData.putExtras(mFreProperties);
         finishAllFREActivities(Activity.RESULT_OK, resultData);