Revert 99169 - Delay the metrics policy migration call to make sure ownership has been taken.

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 754 matching lines @@
     return serialized;
 
   } else if (prop == kReleaseChannel) {
     if (!pol.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()) {
-      return kVeritas[pol.metrics_enabled().metrics_enabled()];
+    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