| Index: chrome/browser/chromeos/login/eula_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/eula_screen.cc b/chrome/browser/chromeos/login/eula_screen.cc
|
| index d33a39a8163e05c2b7c11a31d99d300f3b64cb48..f96d5cac7a8e8abd2b752f7ec07c4e2dfcbd3a5a 100644
|
| --- a/chrome/browser/chromeos/login/eula_screen.cc
|
| +++ b/chrome/browser/chromeos/login/eula_screen.cc
|
| @@ -28,13 +28,8 @@ void EulaScreen::PrepareToShow() {
|
|
|
| void EulaScreen::Show() {
|
| // Command to own the TPM.
|
| - if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
|
| - chromeos::CrosLibrary::Get()->
|
| - GetCryptohomeLibrary()->TpmCanAttemptOwnership();
|
| - } else {
|
| - LOG(ERROR) << "Cros library not loaded. "
|
| - << "We must have disabled the link that led here.";
|
| - }
|
| + chromeos::CrosLibrary::Get()->
|
| + GetCryptohomeLibrary()->TpmCanAttemptOwnership();
|
| actor_->Show();
|
| }
|
|
|
| @@ -43,8 +38,7 @@ void EulaScreen::Hide() {
|
| }
|
|
|
| bool EulaScreen::IsTpmEnabled() const {
|
| - return chromeos::CrosLibrary::Get()->EnsureLoaded() &&
|
| - chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
|
| + return chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
|
| }
|
|
|
| GURL EulaScreen::GetOemEulaUrl() const {
|
|
|