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

chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc

Index: chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
index fa5685e16aa6fb8c651a585140f6b81cde08bab3..a6d460b16eef7aad5f0540e2e944d59b1533c1a3 100644
--- a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
@@ -34,12 +34,7 @@ class ChromeMetricsServiceAccessorTest : public testing::Test {
 
 TEST_F(ChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
 #if defined(GOOGLE_CHROME_BUILD)
-#if !defined(OS_CHROMEOS)
-#if defined(OS_ANDROID)
-  const char* pref = prefs::kCrashReportingEnabled;
-#else
   const char* pref = metrics::prefs::kMetricsReportingEnabled;
-#endif  // defined(OS_ANDROID)
   GetLocalState()->SetDefaultPrefValue(pref, new base::FundamentalValue(false));
 
   GetLocalState()->SetBoolean(pref, false);
@@ -61,7 +56,6 @@ TEST_F(ChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
   GetLocalState()->SetBoolean(pref, true);
   EXPECT_FALSE(
       ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled());
-#endif  // !defined(OS_CHROMEOS)
 #else
   // Metrics Reporting is never enabled when GOOGLE_CHROME_BUILD is undefined.
   EXPECT_FALSE(