Chromium Code Reviews| 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 342c610f167f9a161bb43aaad92bebf618fc4c3e..d7c20bfe4880271283c75d03514434ad42abe8ba 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 |
| @@ -19,6 +19,7 @@ |
| #include "base/threading/thread_task_runner_handle.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/active_directory_join_delegate.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/enrollment_config.h" |
| @@ -109,7 +110,8 @@ class TestingDeviceCloudPolicyManagerChromeOS |
| class DeviceCloudPolicyManagerChromeOSTest |
| : public chromeos::DeviceSettingsTestBase, |
| - public DeviceCloudPolicyManagerChromeOS::Observer { |
| + public DeviceCloudPolicyManagerChromeOS::Observer, |
| + public chromeos::ActiveDirectoryJoinDelegate { |
| protected: |
| DeviceCloudPolicyManagerChromeOSTest() |
| : fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()), |
| @@ -251,6 +253,11 @@ class DeviceCloudPolicyManagerChromeOSTest |
| MOCK_METHOD0(OnDeviceCloudPolicyManagerConnected, void()); |
| MOCK_METHOD0(OnDeviceCloudPolicyManagerDisconnected, void()); |
| + // Overriden from ActiveDirectoryJoinDelegate: |
|
Thiemo Nagel
2017/02/14 14:45:00
Nit: Overridden
Roman Sorokin (ftl)
2017/02/14 16:01:33
Done.
|
| + void JoinDomain(chromeos::OnDomainJoinedCallback on_joined_callback) { |
| + NOTREACHED(); |
| + } |
| + |
| std::unique_ptr<chromeos::InstallAttributes> install_attributes_; |
| scoped_refptr<net::URLRequestContextGetter> request_context_getter_; |
| @@ -504,7 +511,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
| : EnrollmentConfig::MODE_MANUAL; |
| std::string token = with_cert ? "" : "auth token"; |
| initializer_->StartEnrollment( |
| - &device_management_service_, enrollment_config, token, |
| + &device_management_service_, this, enrollment_config, token, |
| base::Bind(&DeviceCloudPolicyManagerChromeOSEnrollmentTest::Done, |
| base::Unretained(this))); |
| base::RunLoop().RunUntilIdle(); |