Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side

chrome/browser/policy/configuration_policy_handler_list_factory.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/pref_value_map.h"
@@ skipping 104 matching lines @@
     base::Value::TYPE_BOOLEAN },
   { key::kPasswordManagerAllowShowPasswords,
     password_manager::prefs::kPasswordManagerAllowShowPasswords,
     base::Value::TYPE_BOOLEAN },
   { key::kPrintingEnabled,
     prefs::kPrintingEnabled,
     base::Value::TYPE_BOOLEAN },
   { key::kDisablePrintPreview,
     prefs::kPrintPreviewDisabled,
     base::Value::TYPE_BOOLEAN },
-  { key::kMetricsReportingEnabled,
-    metrics::prefs::kMetricsReportingEnabled,
-    base::Value::TYPE_BOOLEAN },
   { key::kApplicationLocaleValue,
     prefs::kApplicationLocale,
     base::Value::TYPE_STRING },
   { key::kDisabledPlugins,
     prefs::kPluginsDisabledPlugins,
     base::Value::TYPE_LIST },
   { key::kDisabledPluginsExceptions,
     prefs::kPluginsDisabledPluginsExceptions,
     base::Value::TYPE_LIST },
   { key::kEnabledPlugins,
@@ skipping 338 matching lines @@
     prefs::kCaptivePortalAuthenticationIgnoresProxy,
     base::Value::TYPE_BOOLEAN },
   { key::kForceMaximizeOnFirstRun,
     prefs::kForceMaximizeOnFirstRun,
     base::Value::TYPE_BOOLEAN },
   { key::kUnifiedDesktopEnabledByDefault,
     prefs::kUnifiedDesktopEnabledByDefault,
     base::Value::TYPE_BOOLEAN },
 #endif  // defined(OS_CHROMEOS)
 
+#if defined(OS_CHROMEOS)

[Alexei Svitkine (slow), 2015/10/16 21:27:16]

I think this could use a comment about the discrepancy.

[gayane -on leave until 09-2017, 2015/10/19 21:32:39]

Done.

+  { key::kDeviceMetricsReportingEnabled,
+    metrics::prefs::kMetricsReportingEnabled,
+    base::Value::TYPE_BOOLEAN },
+#else
+  { key::kMetricsReportingEnabled,
+    metrics::prefs::kMetricsReportingEnabled,
+    base::Value::TYPE_BOOLEAN },
+#endif
+
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   { key::kBackgroundModeEnabled,
     prefs::kBackgroundModeEnabled,
     base::Value::TYPE_BOOLEAN },
 #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
 
 #if defined(OS_ANDROID)
   { key::kDataCompressionProxyEnabled,
     data_reduction_proxy::prefs::kDataReductionProxyEnabled,
     base::Value::TYPE_BOOLEAN },
@@ skipping 300 matching lines @@
       SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
       SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
   handlers->AddHandler(make_scoped_ptr(
       new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
 #endif  // defined(OS_CHROMEOS)
 
   return handlers.Pass();
 }
 
 }  // namespace policy