Revert of 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 43d6f7319d41262ceedcb6aec8a4bf5ea0a84137..289fdccc627e22848be50d771b09d86b636424ad 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
@@ -10,7 +10,6 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -47,7 +46,6 @@ 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;
@@ -55,16 +53,12 @@ public class PrivacyPreferences extends PreferenceFragment
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        PrivacyPreferencesManager privacyPrefManager =
-                PrivacyPreferencesManager.getInstance(getActivity());
-        privacyPrefManager.migrateNetworkPredictionPreferences();
+        PrivacyPreferencesManager.getInstance(getActivity()).migrateNetworkPredictionPreferences();
         addPreferencesFromResource(R.xml.privacy_preferences);
         getActivity().setTitle(R.string.prefs_privacy);
         setHasOptionsMenu(true);
 
         mManagedPreferenceDelegate = createManagedPreferenceDelegate();
-        PreferenceScreen preferenceScreen = getPreferenceScreen();
 
         NetworkPredictionPreference networkPredictionPref =
                 (NetworkPredictionPreference) findPreference(PREF_NETWORK_PREDICTIONS);
@@ -73,14 +67,15 @@ public class PrivacyPreferences extends PreferenceFragment
         NetworkPredictionOptions networkPredictionOptions = PrefServiceBridge.getInstance()
                 .getNetworkPredictionOptions();
 
-        boolean isMobileNetworkCapable = privacyPrefManager.isMobileNetworkCapable();
+        boolean isMobileNetworkCapable =
+                PrivacyPreferencesManager.getInstance(getActivity()).isMobileNetworkCapable();
         if (isMobileNetworkCapable) {
-            preferenceScreen.removePreference(networkPredictionNoCellularPref);
+            getPreferenceScreen().removePreference(networkPredictionNoCellularPref);
             networkPredictionPref.setValue(networkPredictionOptions.enumToString());
             networkPredictionPref.setOnPreferenceChangeListener(this);
             networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
         } else {
-            preferenceScreen.removePreference(networkPredictionPref);
+            getPreferenceScreen().removePreference(networkPredictionPref);
             networkPredictionNoCellularPref.setChecked(
                     networkPredictionOptions != NetworkPredictionOptions.NETWORK_PREDICTION_NEVER);
             networkPredictionNoCellularPref.setOnPreferenceChangeListener(this);
@@ -92,21 +87,15 @@ public class PrivacyPreferences extends PreferenceFragment
                 (CrashDumpUploadPreference) findPreference(PREF_CRASH_DUMP_UPLOAD);
         ChromeBaseCheckBoxPreference uploadCrashDumpNoCellularPref =
                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CRASH_DUMP_UPLOAD_NO_CELLULAR);
-        if (privacyPrefManager.isCellularUploadingEnabled()) {
-            preferenceScreen.removePreference(uploadCrashDumpNoCellularPref);
-            preferenceScreen.removePreference(uploadCrashDumpPref);
+
+        if (isMobileNetworkCapable) {
+            getPreferenceScreen().removePreference(uploadCrashDumpNoCellularPref);
+            uploadCrashDumpPref.setOnPreferenceChangeListener(this);
+            uploadCrashDumpPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
         } else {
-            preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
-            if (isMobileNetworkCapable) {
-                preferenceScreen.removePreference(uploadCrashDumpNoCellularPref);
-                uploadCrashDumpPref.setOnPreferenceChangeListener(this);
-                uploadCrashDumpPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-            } else {
-                preferenceScreen.removePreference(uploadCrashDumpPref);
-                uploadCrashDumpNoCellularPref.setOnPreferenceChangeListener(this);
-                uploadCrashDumpNoCellularPref.setManagedPreferenceDelegate(
-                        mManagedPreferenceDelegate);
-            }
+            getPreferenceScreen().removePreference(uploadCrashDumpPref);
+            uploadCrashDumpNoCellularPref.setOnPreferenceChangeListener(this);
+            uploadCrashDumpNoCellularPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
         }
 
         ChromeBaseCheckBoxPreference navigationErrorPref =
@@ -120,7 +109,7 @@ public class PrivacyPreferences extends PreferenceFragment
         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
         if (!((Preferences) getActivity()).isContextualSearchEnabled()) {
-            preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+            getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
         }
 
         ButtonPreference clearBrowsingData =
@@ -215,17 +204,6 @@ 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() {