New UMA settings fragment for Chrome on Android.

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
index efd8ebedcc018ea73e9ea9f36bcd0bea72e25a89..3cd5368ba4511b5df6e44504d7089c7498270fca 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -46,6 +46,7 @@ public class PrivacyPreferences extends PreferenceFragment
             "crash_dump_upload_no_cellular";
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+    private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
 
     private ClearBrowsingDataDialogFragment mClearBrowsingDataDialogFragment;
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -87,15 +88,21 @@ public class PrivacyPreferences extends PreferenceFragment
                 (CrashDumpUploadPreference) findPreference(PREF_CRASH_DUMP_UPLOAD);
         ChromeBaseCheckBoxPreference uploadCrashDumpNoCellularPref =
                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CRASH_DUMP_UPLOAD_NO_CELLULAR);
-
-        if (isMobileNetworkCapable) {
+        if (PrivacyPreferencesManager.getInstance(getActivity()).isCellularEnabledByExperiment()) {
             getPreferenceScreen().removePreference(uploadCrashDumpNoCellularPref);
-            uploadCrashDumpPref.setOnPreferenceChangeListener(this);
-            uploadCrashDumpPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-        } else {
             getPreferenceScreen().removePreference(uploadCrashDumpPref);

[Alexei Svitkine (slow), 2015/03/09 18:26:27]

Nit: Cache getPreferenceScreen() result in a var above the if, since it's used
multiple times.

[gayane -on leave until 09-2017, 2015/03/09 23:07:25]

Done.

-            uploadCrashDumpNoCellularPref.setOnPreferenceChangeListener(this);
-            uploadCrashDumpNoCellularPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+        } else {
+            getPreferenceScreen().removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
+            if (isMobileNetworkCapable) {
+                getPreferenceScreen().removePreference(uploadCrashDumpNoCellularPref);
+                uploadCrashDumpPref.setOnPreferenceChangeListener(this);
+                uploadCrashDumpPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+            } else {
+                getPreferenceScreen().removePreference(uploadCrashDumpPref);
+                uploadCrashDumpNoCellularPref.setOnPreferenceChangeListener(this);
+                uploadCrashDumpNoCellularPref.setManagedPreferenceDelegate(
+                        mManagedPreferenceDelegate);
+            }
         }
 
         ChromeBaseCheckBoxPreference navigationErrorPref =
@@ -204,6 +211,17 @@ public class PrivacyPreferences extends PreferenceFragment
                 contextualPref.setSummary(getActivity().getResources().getText(R.string.text_on));
             }
         }
+        Preference usageAndCrashReportingPref = findPreference(PREF_USAGE_AND_CRASH_REPORTING);
+        if (usageAndCrashReportingPref != null) {
+            if (PrivacyPreferencesManager.getInstance(getActivity())
+                            .isUsageAndCrashReportingEnabled()) {
+                usageAndCrashReportingPref.setSummary(
+                        getActivity().getResources().getText(R.string.text_on));
+            } else {
+                usageAndCrashReportingPref.setSummary(
+                        getActivity().getResources().getText(R.string.text_off));
+            }
+        }
     }
 
     private ManagedPreferenceDelegate createManagedPreferenceDelegate() {