| Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| index 2039e0d7764050ad3579722fcacc4f050352e7a1..3c107ac4e5eaddccac652d6c3d6817d8999df863 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
|
| @@ -15,6 +15,8 @@
|
| #include "base/prefs/pref_registry_simple.h"
|
| #include "base/prefs/testing_pref_service.h"
|
| #include "base/run_loop.h"
|
| +#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
|
| +#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
|
| #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
|
| #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
|
| @@ -26,6 +28,7 @@
|
| #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| +#include "chrome/test/base/testing_profile.h"
|
| #include "chromeos/cryptohome/system_salt_getter.h"
|
| #include "chromeos/dbus/dbus_client_implementation_type.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| @@ -105,6 +108,13 @@ class DeviceCloudPolicyManagerChromeOSTest
|
|
|
| virtual void SetUp() override {
|
| DeviceSettingsTestBase::SetUp();
|
| +
|
| + device_policy_.policy_data().set_management_mode(
|
| + em::PolicyData::LOCAL_OWNER);
|
| + device_policy_.Build();
|
| + device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
|
| + ReloadDeviceSettings();
|
| +
|
| dbus_setter_->SetCryptohomeClient(
|
| scoped_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_));
|
|
|
| @@ -399,9 +409,14 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
|
| SaveArg<6>(®ister_request_)));
|
| DeviceCloudPolicyInitializer::AllowedDeviceModes modes;
|
| modes[DEVICE_MODE_ENTERPRISE] = true;
|
| +
|
| + chromeos::OwnerSettingsServiceChromeOS* owner_settings_service =
|
| + chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
|
| + profile_.get());
|
| + ASSERT_TRUE(owner_settings_service);
|
| +
|
| initializer_->StartEnrollment(
|
| - management_mode_,
|
| - &device_management_service_,
|
| + management_mode_, &device_management_service_, owner_settings_service,
|
| "auth token", is_auto_enrollment_, modes,
|
| base::Bind(&DeviceCloudPolicyManagerChromeOSEnrollmentTest::Done,
|
| base::Unretained(this)));
|
|
|