| Index: chrome/browser/policy/browser_policy_connector.cc
|
| diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
|
| index 639fb527251e8244223cfc2ea9cc9c2c0eef705f..4bc9cb4ff369ecdaed2248e34796615756a3f0ca 100644
|
| --- a/chrome/browser/policy/browser_policy_connector.cc
|
| +++ b/chrome/browser/policy/browser_policy_connector.cc
|
| @@ -70,6 +70,7 @@
|
| #include "chrome/browser/policy/cloud/resource_cache.h"
|
| #include "chromeos/chromeos_paths.h"
|
| #include "chromeos/chromeos_switches.h"
|
| +#include "chromeos/cryptohome/cryptohome_library.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #else
|
| @@ -128,12 +129,11 @@ BrowserPolicyConnector::BrowserPolicyConnector()
|
| new DeviceManagementService(GetDeviceManagementUrl()));
|
|
|
| #if defined(OS_CHROMEOS)
|
| - chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
|
| - // |cros_library| may be NULL on unit tests. DBusThreadManager may not be
|
| - // initialized on unit tests..
|
| - if (cros_library && chromeos::DBusThreadManager::IsInitialized()) {
|
| + // CryptohomeLibrary or DBusThreadManager may be uninitialized on unit tests.
|
| + if (chromeos::CryptohomeLibrary::IsInitialized() &&
|
| + chromeos::DBusThreadManager::IsInitialized()) {
|
| chromeos::CryptohomeLibrary* cryptohome =
|
| - cros_library->GetCryptohomeLibrary();
|
| + chromeos::CryptohomeLibrary::Get();
|
| chromeos::CryptohomeClient* cryptohome_client =
|
| chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
|
| install_attributes_.reset(
|
|
|