Use kMetricsReportingEnabled instead of kStatsReporingPref on metrics side

chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

 // Copyright (c) 2012 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/chromeos/settings/device_settings_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 93 matching lines @@
     EXPECT_CALL(*this, SettingChanged(_)).Times(AtLeast(1));
     em::DeviceLogUploadSettingsProto* proto =
         device_policy_.payload().mutable_device_log_upload_settings();
     proto->set_system_log_upload_enabled(enable_system_log_upload);
     device_policy_.Build();
     device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
     ReloadDeviceSettings();
     Mock::VerifyAndClearExpectations(this);
   }
 
+  // Helper routine to enable/disable metrics report upload settings in policy.
+  void SetMetricsReportingSettings(bool enable_metrics_reporting) {
+    EXPECT_CALL(*this, SettingChanged(_)).Times(AtLeast(1));
+    em::MetricsEnabledProto* proto =
+        device_policy_.payload().mutable_metrics_enabled();
+    proto->set_metrics_enabled(enable_metrics_reporting);
+    device_policy_.Build();
+    device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
+    ReloadDeviceSettings();
+    Mock::VerifyAndClearExpectations(this);
+  }
+
   // Helper routine to ensure all heartbeat policies have been correctly
   // decoded.
   void VerifyHeartbeatSettings(bool expected_enable_state,
                                int expected_frequency) {
 
     const base::FundamentalValue expected_enabled_value(expected_enable_state);
     EXPECT_TRUE(base::Value::Equals(provider_->Get(kHeartbeatEnabled),
                                     &expected_enabled_value));
 
     const base::FundamentalValue expected_frequency_value(expected_frequency);
@@ skipping 110 matching lines @@
   EXPECT_EQ(std::string(), device_settings_test_helper_.policy_blob());
 
   // Verify the change has been applied.
   const base::Value* saved_value = provider_->Get(kReleaseChannel);
   ASSERT_TRUE(saved_value);
   EXPECT_TRUE(saved_value->GetAsString(&string_value));
   ASSERT_EQ("stable-channel", string_value);
 }
 
 TEST_F(DeviceSettingsProviderTest, SetPrefFailed) {
+  SetMetricsReportingSettings(false);
+
   // If we are not the owner no sets should work.
   base::FundamentalValue value(true);
   EXPECT_CALL(*this, SettingChanged(kStatsReportingPref)).Times(1);
   provider_->Set(kStatsReportingPref, value);
   Mock::VerifyAndClearExpectations(this);
 
   // This shouldn't trigger a write.
   device_settings_test_helper_.set_policy_blob(std::string());
   FlushDeviceSettings();
   EXPECT_EQ(std::string(), device_settings_test_helper_.policy_blob());
@@ skipping 103 matching lines @@
 
   EXPECT_EQ(CrosSettingsProvider::TEMPORARILY_UNTRUSTED,
             provider_->PrepareTrustedValues(
                 base::Bind(&DeviceSettingsProviderTest::GetTrustedCallback,
                            base::Unretained(this))));
 
   ReloadDeviceSettings();
   Mock::VerifyAndClearExpectations(this);
 }
 
-TEST_F(DeviceSettingsProviderTest, StatsReportingMigration) {
-  // Create the legacy consent file.
-  base::FilePath consent_file;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &consent_file));
-  consent_file = consent_file.AppendASCII("Consent To Send Stats");
-  ASSERT_EQ(1, base::WriteFile(consent_file, "0", 1));
-
-  // This should trigger migration because the metrics policy isn't in the blob.
-  device_settings_test_helper_.set_policy_blob(std::string());
-  FlushDeviceSettings();
-  EXPECT_EQ(std::string(), device_settings_test_helper_.policy_blob());
-
-  // Verify that migration has kicked in.
-  const base::Value* saved_value = provider_->Get(kStatsReportingPref);
-  ASSERT_TRUE(saved_value);
-  bool bool_value;
-  EXPECT_TRUE(saved_value->GetAsBoolean(&bool_value));
-  EXPECT_FALSE(bool_value);
-}
-
 TEST_F(DeviceSettingsProviderTest, LegacyDeviceLocalAccounts) {
   EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());
   em::DeviceLocalAccountInfoProto* account =
       device_policy_.payload().mutable_device_local_accounts()->add_account();
   account->set_deprecated_public_session_id(
       policy::PolicyBuilder::kFakeUsername);
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
   ReloadDeviceSettings();
   Mock::VerifyAndClearExpectations(this);
@@ skipping 102 matching lines @@
 }
 
 TEST_F(DeviceSettingsProviderTest, DecodeLogUploadSettings) {
   SetLogUploadSettings(true);
   VerifyLogUploadSettings(true);
 
   SetLogUploadSettings(false);
   VerifyLogUploadSettings(false);
 }
 } // namespace chromeos