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

components/metrics/metrics_service_accessor.h

Index: components/metrics/metrics_service_accessor.h
diff --git a/components/metrics/metrics_service_accessor.h b/components/metrics/metrics_service_accessor.h
index eabf8a122391e27c6bf3eac08ed15c6ab94ee2ad..c4b5e62f195445fd4d583df37373a92bf4c8ebb2 100644
--- a/components/metrics/metrics_service_accessor.h
+++ b/components/metrics/metrics_service_accessor.h
@@ -29,18 +29,8 @@ class 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