Eliminate CrosLibrary::EnsureLoaded

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/bind.h"
@@ skipping 316 matching lines @@
 
 CheckWhitelistOp::CheckWhitelistOp(const std::string& email,
                                    SignedSettings::Delegate<bool>* d)
     : email_(email),
       d_(d) {
 }
 
 CheckWhitelistOp::~CheckWhitelistOp() {}
 
 void CheckWhitelistOp::Execute() {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   std::vector<uint8> sig;
   std::string email_to_check = email_;
   if (!service_->has_cached_policy()) {
     TryToFetchPolicyAndCallBack();
     return;
   }
   if (LookUpInPolicy(email_to_check)) {
     VLOG(2) << "Whitelist check was successful for " << email_to_check;
     Succeed(true);
     return;
@@ skipping 300 matching lines @@
 
 RetrievePropertyOp::RetrievePropertyOp(const std::string& name,
                                        SignedSettings::Delegate<std::string>* d)
     : name_(name),
       d_(d) {
 }
 
 RetrievePropertyOp::~RetrievePropertyOp() {}
 
 void RetrievePropertyOp::Execute() {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   // TODO(dilmah): Fix the race:
   // At the moment when device becomes owned there is lapse of time after
   // device has been owned and before temp_storage settings are finally
   // persisted into signed settings.
   // In this lapse of time Retrieve loses access to those settings.
   if (service_->GetStatus(true) != OwnershipService::OWNERSHIP_TAKEN) {
     if (g_browser_process &&
         g_browser_process->local_state() &&
         SignedSettingsTempStorage::Retrieve(
             name_, &value_, g_browser_process->local_state())) {
@@ skipping 262 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