Move IsRunningOnChromeOS to SysInfo

chromeos/cert_loader.cc

 // Copyright (c) 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 "chromeos/cert_loader.h"
 
 #include <algorithm>
 
-#include "base/chromeos/chromeos_version.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "crypto/encryptor.h"
 #include "crypto/nss_util.h"
 #include "crypto/sha2.h"
 #include "crypto/symmetric_key.h"
 #include "net/cert/nss_cert_database.h"
 
@@ skipping 21 matching lines @@
 
 void LoadNSSCertificates(net::CertificateList* cert_list) {
   net::NSSCertDatabase::GetInstance()->ListCerts(cert_list);
 }
 
 void CallOpenPersistentNSSDB() {
   // Called from crypto_task_runner_.
   VLOG(1) << "CallOpenPersistentNSSDB";
 
   // Ensure we've opened the user's key/certificate database.
-  if (base::chromeos::IsRunningOnChromeOS())
+  if (base::SysInfo::IsRunningOnChromeOS())
     crypto::OpenPersistentNSSDB();
   crypto::EnableTPMTokenForNSS();
 }
 
 }  // namespace
 
 static CertLoader* g_cert_loader = NULL;
 
 // static
 void CertLoader::Initialize() {
@@ skipping 86 matching lines @@
       LoginState::Get()->IsInSafeMode();
 
   VLOG(1) << "RequestCertificates: " << request_certificates;
   if (!request_certificates)
     return;
 
   certificates_requested_ = true;
 
   // Ensure we only initialize the TPM token once.
   DCHECK_EQ(tpm_token_state_, TPM_STATE_UNKNOWN);
-  if (!initialize_tpm_for_test_ && !base::chromeos::IsRunningOnChromeOS())
+  if (!initialize_tpm_for_test_ && !base::SysInfo::IsRunningOnChromeOS())
     tpm_token_state_ = TPM_DISABLED;
 
   // Treat TPM as disabled for guest users since they do not store certs.
   if (LoginState::Get()->IsGuestUser())
     tpm_token_state_ = TPM_DISABLED;
 
   InitializeTokenAndLoadCertificates();
 }
 
 void CertLoader::InitializeTokenAndLoadCertificates() {
@@ skipping 217 matching lines @@
   VLOG(1) << "OnCertRemoved";
   LoadCertificates();
 }
 
 void CertLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeRequestCertificates();
 }
 
 }  // namespace chromeos