Revert 94350 - Merge 94322 - Rewire the metrics pref to the signed settings store on chromeos.

chrome/browser/chromeos/login/signed_settings.cc

 // Copyright (c) 2011 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/login/signed_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 616 matching lines @@
 
   } else if (prop == kSettingProxyEverywhere) {
     // TODO(cmasone): NOTIMPLEMENTED() once http://crosbug.com/13052 is fixed.
     bool success = pol.mutable_device_proxy_settings()->ParseFromString(value);
     DCHECK(success);
 
   } else if (prop == kReleaseChannel) {
     em::ReleaseChannelProto* release_channel = pol.mutable_release_channel();
     release_channel->set_release_channel(value);
 
-  } else if (prop == kStatsReportingPref) {
-    em::MetricsEnabledProto* metrics = pol.mutable_metrics_enabled();
-    metrics->set_metrics_enabled(value == "true");
-
   } else {
     NOTREACHED();
   }
   poldata->set_policy_value(pol.SerializeAsString());
 }
 
 void StorePropertyOp::PerformCallback(SignedSettings::ReturnCode code,
                                       bool value) {
   d_->OnSettingsOpCompleted(code, value);
 }
@@ skipping 78 matching lines @@
     // If we have the allow_new_users bool, and it is true, we honor that above.
     // In all other cases (don't have it, have it and it is set to false, etc),
     // We will honor the user_whitelist() if it is there and populated.
     // Otherwise, fail open (to do otherwise could render the device unusable).
     if (!pol.has_user_whitelist())
       return kVeritas[1];  // Default to allowing new users.
     return kVeritas[pol.user_whitelist().user_whitelist_size() == 0];
 
   } else if (prop == kAccountsPrefAllowGuest) {
     if (!pol.has_guest_mode_enabled() ||
-        !pol.guest_mode_enabled().has_guest_mode_enabled()) {
+        !pol.guest_mode_enabled().has_guest_mode_enabled())
       return kVeritas[1];  // Default to allowing guests;
-    }
     return kVeritas[pol.guest_mode_enabled().guest_mode_enabled()];
 
   } else if (prop == kAccountsPrefShowUserNamesOnSignIn) {
     if (!pol.has_show_user_names() ||
-        !pol.show_user_names().has_show_user_names()) {
+        !pol.show_user_names().has_show_user_names())
       return kVeritas[1];  // Default to showing pods on the login screen;
-    }
     return kVeritas[pol.show_user_names().show_user_names()];
 
   } else if (prop == kSignedDataRoamingEnabled) {
     if (!pol.has_data_roaming_enabled() ||
-        !pol.data_roaming_enabled().has_data_roaming_enabled()) {
+        !pol.data_roaming_enabled().has_data_roaming_enabled())
       return kVeritas[0];  // Default to disabling cellular data roaming;
-    }
     return kVeritas[pol.data_roaming_enabled().data_roaming_enabled()];
 
   } else if (prop == kSettingProxyEverywhere) {
     // TODO(cmasone): NOTIMPLEMENTED() once http://crosbug.com/13052 is fixed.
     std::string serialized;
     if (!pol.has_device_proxy_settings() ||
-        !pol.device_proxy_settings().SerializeToString(&serialized)) {
+        !pol.device_proxy_settings().SerializeToString(&serialized))
       return "";           // Default to invalid proxy config (will be ignored).
-    }
     return serialized;
 
   } else if (prop == kReleaseChannel) {
     if (!pol.has_release_channel() ||
-        !pol.release_channel().has_release_channel()) {
+        !pol.release_channel().has_release_channel())
       return "";           // Default to an invalid channel (will be ignored).
-    }
     return pol.release_channel().release_channel();
 
-  } else if (prop == kStatsReportingPref) {
-    if (!pol.has_metrics_enabled() ||
-        !pol.metrics_enabled().metrics_enabled()) {
-      return kVeritas[0];  // Default to not collecting metrics.
-    }
-    return kVeritas[pol.metrics_enabled().metrics_enabled()];
-
   }
   return std::string();
 }
 
 void RetrievePropertyOp::PerformCallback(SignedSettings::ReturnCode code,
                                          const std::string& value) {
   d_->OnSettingsOpCompleted(code, value);
 }
 
 StorePolicyOp::StorePolicyOp(em::PolicyFetchResponse* policy,
@@ skipping 167 matching lines @@
   sig.assign(sig_ptr, sig_ptr + policy_.policy_data_signature().length());
   service_->StartVerifyAttempt(policy_.policy_data(), sig, this);
 }
 
 void RetrievePolicyOp::PerformCallback(SignedSettings::ReturnCode code,
                                        const em::PolicyFetchResponse& value) {
   d_->OnSettingsOpCompleted(code, value);
 }
 
 }  // namespace chromeos