Move IsRunningOnChromeOS to SysInfo

chromeos/cryptohome/cryptohome_library.cc

 // Copyright (c) 2012 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/cryptohome/cryptohome_library.h"
 
 #include <map>
 
 #include "base/bind.h"
-#include "base/chromeos/chromeos_version.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/sys_info.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.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"
 
 namespace chromeos {
 
@@ skipping 79 matching lines @@
     return result;
   }
 
   virtual std::string GetSystemSalt() OVERRIDE {
     LoadSystemSalt();  // no-op if it's already loaded.
     return system_salt_;
   }
 
   virtual std::string EncryptWithSystemSalt(const std::string& token) OVERRIDE {
     // Don't care about token encryption while debugging.
-    if (!base::chromeos::IsRunningOnChromeOS())
+    if (!base::SysInfo::IsRunningOnChromeOS())
       return token;
 
     if (!LoadSystemSaltKey()) {
       LOG(WARNING) << "System salt key is not available for encrypt.";
       return std::string();
     }
     return EncryptTokenWithKey(system_salt_key_.get(),
                                system_salt_,
                                token);
   }
 
   virtual std::string DecryptWithSystemSalt(
       const std::string& encrypted_token_hex) OVERRIDE {
     // Don't care about token encryption while debugging.
-    if (!base::chromeos::IsRunningOnChromeOS())
+    if (!base::SysInfo::IsRunningOnChromeOS())
       return encrypted_token_hex;
 
     if (!LoadSystemSaltKey()) {
       LOG(WARNING) << "System salt key is not available for decrypt.";
       return std::string();
     }
     return DecryptTokenWithKey(system_salt_key_.get(),
                                system_salt_,
                                encrypted_token_hex);
   }
@@ skipping 155 matching lines @@
 
 CryptohomeLibrary::CryptohomeLibrary() {}
 CryptohomeLibrary::~CryptohomeLibrary() {}
 
 static CryptohomeLibrary* g_cryptohome_library = NULL;
 static CryptohomeLibrary* g_test_cryptohome_library = NULL;
 
 // static
 void CryptohomeLibrary::Initialize() {
   CHECK(!g_cryptohome_library);
-  if (base::chromeos::IsRunningOnChromeOS())
+  if (base::SysInfo::IsRunningOnChromeOS())
     g_cryptohome_library = new CryptohomeLibraryImpl();
   else
     g_cryptohome_library = new CryptohomeLibraryStubImpl();
 }
 
 // static
 bool CryptohomeLibrary::IsInitialized() {
   return g_cryptohome_library;
 }
 
@@ skipping 18 matching lines @@
   CHECK(!g_test_cryptohome_library || !impl);
   g_test_cryptohome_library = impl;
 }
 
 // static
 CryptohomeLibrary* CryptohomeLibrary::GetTestImpl() {
   return new CryptohomeLibraryStubImpl();
 }
 
 } // namespace chromeos