Clean up UMA 3g experiment and unify metrics enabled pref for Android

components/metrics/metrics_service_accessor.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_METRICS_METRICS_SERVICE_ACCESSOR_H_
 #define COMPONENTS_METRICS_METRICS_SERVICE_ACCESSOR_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 // specialization and enable access there by declaring friends.
 class MetricsServiceAccessor {
  protected:
   // Constructor declared as protected to enable inheritance. Descendants should
   // disallow instantiation.
   MetricsServiceAccessor() {}
 
   // Returns whether metrics reporting is enabled, using the value of the
   // kMetricsReportingEnabled pref in |pref_service| to determine whether user
   // has enabled reporting.
-  // NOTE: This method currently does not return the correct value on ChromeOS
-  // and Android due to http://crbug.com/362192 and http://crbug.com/532084. See
-  // ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled().
   static bool IsMetricsReportingEnabled(PrefService* pref_service);
 
-  // Returns whether metrics reporting is enabled, using the value of
-  // |enabled_in_prefs| to determine whether the user has enabled reporting.
-  // Exists because kMetricsReportingEnabled is currently not used on all
-  // platforms.
-  // TODO(gayane): Consolidate metric prefs on all platforms and eliminate this
-  // method.  http://crbug.com/362192, http://crbug.com/532084
-  static bool IsMetricsReportingEnabledWithPrefValue(bool enabled_in_prefs);
 
   // Registers a field trial name and group with |metrics_service| (if not
   // null), to be used to annotate a UMA report with a particular configuration
   // state. Returns true on success.
   // See the comment on MetricsService::RegisterSyntheticFieldTrial() for
   // details.
   static bool RegisterSyntheticFieldTrial(MetricsService* metrics_service,
                                           const std::string& trial_name,
                                           const std::string& group_name);
 
@@ skipping 21 matching lines @@
       uint32_t trial_name_hash,
       uint32_t group_name_hash);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceAccessor);
 };
 
 }  // namespace metrics
 
 #endif  // COMPONENTS_METRICS_METRICS_SERVICE_ACCESSOR_H_