| Index: chrome/browser/chromeos/system/drm_settings.cc
|
| diff --git a/chrome/browser/chromeos/system/drm_settings.cc b/chrome/browser/chromeos/system/drm_settings.cc
|
| index 6206a45106ac982862e0e6776818ef1318b7d1ae..aa70e349a46ae8f212211431d5e21c5752163cd0 100644
|
| --- a/chrome/browser/chromeos/system/drm_settings.cc
|
| +++ b/chrome/browser/chromeos/system/drm_settings.cc
|
| @@ -12,12 +12,11 @@
|
| #include "base/path_service.h"
|
| #include "base/string_util.h"
|
| #include "base/strings/string_number_conversions.h"
|
| -#include "chrome/browser/chromeos/cros/cros_library.h"
|
| -#include "chrome/browser/chromeos/cros/cryptohome_library.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chromeos/chromeos_switches.h"
|
| +#include "chromeos/cryptohome/cryptohome_library.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "crypto/encryptor.h"
|
| #include "crypto/sha2.h"
|
| @@ -62,8 +61,7 @@ void ManageDrmIdentifierOnFileThread(bool enable, const std::string& email) {
|
|
|
| // Build the identifier as follows:
|
| // SHA256(system-salt||service||SHA256(system-salt||service||email))
|
| - chromeos::CryptohomeLibrary* c_home =
|
| - chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
|
| + chromeos::CryptohomeLibrary* c_home = chromeos::CryptohomeLibrary::Get();
|
| std::string salt = c_home->GetSystemSalt();
|
| char id_buf[256 / 8]; // 256-bits for SHA256
|
| std::string input = salt;
|
|
|