| 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 722fa6d5df412ba4450bf2834e94dcb1dcd18283..ccbb5c4e647304600088005a567b7258137169a4 100644
|
| --- a/chrome/browser/policy/browser_policy_connector.cc
|
| +++ b/chrome/browser/policy/browser_policy_connector.cc
|
| @@ -47,6 +47,8 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "base/utf_string_conversions.h"
|
| +#include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
|
| +#include "chrome/browser/chromeos/attestation/attestation_policy_observer.h"
|
| #include "chrome/browser/chromeos/cros/cros_library.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/policy/app_pack_updater.h"
|
| @@ -65,6 +67,8 @@
|
| #include "chrome/browser/chromeos/system/statistics_provider.h"
|
| #include "chrome/browser/chromeos/system/timezone_settings.h"
|
| #include "chrome/browser/policy/cloud/resource_cache.h"
|
| +#include "chromeos/attestation/attestation_flow.h"
|
| +#include "chromeos/cryptohome/async_method_caller.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #else
|
| #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
|
| @@ -188,6 +192,19 @@ void BrowserPolicyConnector::Init(
|
| local_state_,
|
| device_management_service_.get(),
|
| status_provider.Pass());
|
| +
|
| + scoped_ptr<chromeos::attestation::ServerProxy> attestation_ca_client(
|
| + new chromeos::attestation::AttestationCAClient());
|
| + scoped_ptr<chromeos::attestation::AttestationFlow> attestation_flow(
|
| + new chromeos::attestation::AttestationFlow(
|
| + cryptohome::AsyncMethodCaller::GetInstance(),
|
| + chromeos::DBusThreadManager::Get()->GetCryptohomeClient(),
|
| + attestation_ca_client.Pass()));
|
| + attestation_policy_observer_.reset(
|
| + new chromeos::attestation::AttestationPolicyObserver(
|
| + chromeos::CrosSettings::Get(),
|
| + device_cloud_policy_manager_.get(),
|
| + attestation_flow.Pass()));
|
| }
|
|
|
| CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| @@ -231,6 +248,8 @@ void BrowserPolicyConnector::Shutdown() {
|
| // Delete it first.
|
| app_pack_updater_.reset();
|
|
|
| + attestation_policy_observer_.reset();
|
| +
|
| if (device_cloud_policy_manager_)
|
| device_cloud_policy_manager_->Shutdown();
|
| if (device_local_account_policy_provider_)
|
|
|