Chromium Code Reviews| Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc |
| diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc |
| index 70b4ff04f62914e183b8469d652cab6c7d493c4a..817850e97e388a0bfb1410a8acf804a8ee9a1b66 100644 |
| --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc |
| +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc |
| @@ -19,6 +19,7 @@ |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/threading/sequenced_worker_pool.h" |
| #include "chrome/browser/chromeos/policy/app_pack_updater.h" |
| +#include "chrome/browser/chromeos/policy/consumer_management_service.h" |
| #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" |
| #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h" |
| #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| @@ -148,6 +149,11 @@ void BrowserPolicyConnectorChromeOS::Init( |
| consumer_device_management_service_->ScheduleInitialization( |
| kServiceInitializationStartupDelay); |
| + chromeos::CryptohomeClient* cryptohome_client = |
|
bartfab (slow)
2014/08/04 18:44:50
Nit: #include "chromeos/dbus/cryptohome_client.h"
davidyu
2014/08/05 07:26:58
Done.
|
| + chromeos::DBusThreadManager::Get()->GetCryptohomeClient(); |
| + consumer_management_service_.reset( |
| + new ConsumerManagementService(cryptohome_client)); |
| + |
| if (device_cloud_policy_manager_) { |
| // Note: for now the |device_cloud_policy_manager_| is using the global |
| // schema registry. Eventually it will have its own registry, once device |
| @@ -160,7 +166,7 @@ void BrowserPolicyConnectorChromeOS::Init( |
| new DeviceCloudPolicyInitializer( |
| local_state, |
| device_management_service(), |
| - consumer_device_management_service(), |
| + GetConsumerDeviceManagementService(), |
| GetBackgroundTaskRunner(), |
| install_attributes_.get(), |
| state_keys_broker_.get(), |