Revert of Improve computation of PrefHashCalculator::legacy_device_id_instance_.

chrome/browser/prefs/pref_hash_calculator.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/prefs/pref_hash_calculator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/tracked/pref_hash_calculator_helper.h"
 #include "crypto/hmac.h"
 
 namespace {
 
 // Calculates an HMAC of |message| using |key|, encoded as a hexadecimal string.
 std::string GetDigestString(const std::string& key,
                             const std::string& message) {
   crypto::HMAC hmac(crypto::HMAC::SHA256);
@@ skipping 60 matching lines @@
 std::string GenerateDeviceIdLikePrefMetricsServiceDid(
     const std::string& original_device_id) {
   if (original_device_id.empty())
     return std::string();
   return StringToLowerASCII(
       GetDigestString(original_device_id, "PrefMetricsService"));
 }
 
 }  // namespace
 
-// static
-base::LazyInstance<scoped_ptr<const std::string> >::Leaky
-    PrefHashCalculator::legacy_device_id_instance_ = LAZY_INSTANCE_INITIALIZER;
-
 PrefHashCalculator::PrefHashCalculator(const std::string& seed,
                                        const std::string& device_id)
     : seed_(seed),
       device_id_(GenerateDeviceIdLikePrefMetricsServiceDid(device_id)),
       raw_device_id_(device_id),
       get_legacy_device_id_callback_(base::Bind(&GetLegacyDeviceId)) {}
 
 PrefHashCalculator::PrefHashCalculator(
     const std::string& seed,
     const std::string& device_id,
@@ skipping 25 matching lines @@
                                     value_as_string),
                          digest_string)) {
     return VALID_SECURE_LEGACY;
   }
   if (VerifyDigestString(seed_, value_as_string, digest_string))
     return VALID_WEAK_LEGACY;
   return INVALID;
 }
 
 std::string PrefHashCalculator::RetrieveLegacyDeviceId() const {
-  scoped_ptr<const std::string>* legacy_device_id_ptr =
-      legacy_device_id_instance_.Pointer();
-  if (!legacy_device_id_ptr->get()) {
-    // Allow IO on this thread to retrieve the legacy device ID. The result of
-    // this operation is stored in |legacy_device_id_instance_| and will thus
-    // only happen once in this browser's lifetime (as verified by the DCHECK
-    // below). This is not ideal, but this value is required synchronously to be
-    // able to continue loading prefs for this profile. This profile should then
-    // be migrated to a modern device ID and subsequent loads of this profile
-    // shouldn't need to run this code ever again. Another option would be to
-    // kick an early task on the FILE thread to start retrieving this ID on
-    // every startup and block here if the result still hasn't made it in when
-    // we need it, but this isn't great either as in most cases it will be
-    // computed for nothing.
-    // TODO(gab): Remove this when the legacy device ID (M33) becomes
-    // irrelevant.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    static bool legacy_device_id_computed = false;
-    DCHECK(!legacy_device_id_computed);
-    legacy_device_id_ptr->reset(
+  if (!legacy_device_id_instance_) {
+    legacy_device_id_instance_.reset(
         new std::string(GenerateDeviceIdLikePrefMetricsServiceDid(
             get_legacy_device_id_callback_.Run(raw_device_id_))));
-    legacy_device_id_computed = true;
   }
-  return *legacy_device_id_ptr->get();
+  return *legacy_device_id_instance_;
 }