Revert of New UMA settings fragment using Android prefs.

chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java

 // Copyright 2015 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.metrics;
 
 import android.app.Activity;
 import android.content.ComponentCallbacks;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.text.TextUtils;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.chrome.browser.Tab;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.privacy.CrashReportingPermissionManager;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
-import org.chromium.components.variations.VariationsAssociatedData;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.NetworkChangeNotifier;
 
 /**
  * Mainly sets up session stats for chrome. A session is defined as the duration when the
  * application is in the foreground.  Also used to communicate information between Chrome
  * and the framework's MetricService.
  */
 public class UmaSessionStats implements NetworkChangeNotifier.ConnectionTypeObserver {
     private static final String SAMSUNG_MULTWINDOW_PACKAGE = "com.sec.feature.multiwindow";
@@ skipping 65 matching lines @@
             mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) {
                 @Override
                 public void onPageLoadFinished(Tab tab) {
                     recordPageLoadStats(tab.getId());
                 }
             };
         }
 
         nativeUmaResumeSession(sNativeUmaSessionStats);
         NetworkChangeNotifier.addConnectionTypeObserver(this);
-        updatePreferences();
         updateMetricsServiceState();
     }
 
     private static void ensureNativeInitialized() {
         // Lazily create the native object and the notification handler. These objects are never
         // destroyed.
         if (sNativeUmaSessionStats == 0) {
             sNativeUmaSessionStats = nativeInit();
         }
     }
@@ skipping 37 matching lines @@
      */
     public void updateMetricsServiceState() {
         boolean mayRecordStats = !PrivacyPreferencesManager.getInstance(mContext)
                 .isNeverUploadCrashDump();
         boolean mayUploadStats = mReportingPermissionManager.isUploadPermitted();
 
         // Re-start the MetricsService with the given parameters.
         nativeUpdateMetricsServiceState(mayRecordStats, mayUploadStats);
     }
 
-    /**
-     * Updating Android preferences according to equivalent native preferences so that the values
-     * can be retrieved while native preferences are not accessible.
-     */
-    private void updatePreferences() {
-        // Update cellular experiment preference.
-        PrivacyPreferencesManager prefManager = PrivacyPreferencesManager.getInstance(mContext);
-        boolean cellularExperiment = TextUtils.equals("true",
-                VariationsAssociatedData.getVariationParamValue(
-                        "UMA_EnableCellularLogUpload", "Enabled"));
-        prefManager.setCellularExperiment(cellularExperiment);
-
-        // Update metrics reporting preference.
-        if (cellularExperiment) {
-            PrefServiceBridge prefBridge = PrefServiceBridge.getInstance();
-            // If the native preference metrics reporting has not been set, then initialize it
-            // based on the older android preference.
-            if (!prefBridge.hasSetMetricsReporting()) {
-                prefBridge.setMetricsReportingEnabled(prefManager.isUploadCrashDumpEnabled());
-            }
-
-            // Set new Android preference for usage and crash reporting.
-            prefManager.setUsageAndCrashReporting(prefBridge.isMetricsReportingEnabled());
-        }
-    }
-
     @Override
     public void onConnectionTypeChanged(int connectionType) {
         updateMetricsServiceState();
     }
 
     public static void registerExternalExperiment(int studyId, int experimentId) {
         nativeRegisterExternalExperiment(studyId, experimentId);
     }
 
     public static void registerSyntheticFieldTrial(String trialName, String groupName) {
         nativeRegisterSyntheticFieldTrial(trialName, groupName);
     }
 
     private static native long nativeInit();
     private native void nativeUpdateMetricsServiceState(boolean mayRecord, boolean mayUpload);
     private native void nativeUmaResumeSession(long nativeUmaSessionStats);
     private native void nativeUmaEndSession(long nativeUmaSessionStats);
     private static native void nativeLogRendererCrash(boolean isPaused);
     private static native void nativeRegisterExternalExperiment(int studyId,
                                                                 int experimentId);
     private static native void nativeRegisterSyntheticFieldTrial(
             String trialName, String groupName);
     private static native void nativeRecordMultiWindowSession(int areaPercent, int instanceCount);
     private static native void nativeRecordTabCountPerLoad(int numTabsOpen);
     private static native void nativeRecordPageLoaded(boolean isDesktopUserAgent);
     private static native void nativeRecordPageLoadedWithKeyboard();
 
 }