Chromad: Use DM server reply to determine enrollment type

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

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..881d52e09509b1ae51023894a50bf7b1d449ff10 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
@@ -23,6 +23,7 @@
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
+#include "chrome/browser/chromeos/policy/fake_active_directory_join_delegate.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
@@ -223,6 +224,8 @@ class DeviceCloudPolicyManagerChromeOSTest
     initializer_->SetSigningServiceForTesting(
         base::MakeUnique<FakeSigningService>());
     initializer_->Init();
+    fake_ad_join_delegate_ =
+        base::MakeUnique<chromeos::FakeActiveDirectoryJoinDelegate>();
   }
 
   void VerifyPolicyPopulated() {
@@ -270,6 +273,9 @@ class DeviceCloudPolicyManagerChromeOSTest
   SchemaRegistry schema_registry_;
   std::unique_ptr<TestingDeviceCloudPolicyManagerChromeOS> manager_;
   std::unique_ptr<DeviceCloudPolicyInitializer> initializer_;
+  std::unique_ptr<chromeos::FakeActiveDirectoryJoinDelegate>
+      fake_ad_join_delegate_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerChromeOSTest);
 };
@@ -504,7 +510,8 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
                                        : EnrollmentConfig::MODE_MANUAL;
     std::string token = with_cert ? "" : "auth token";
     initializer_->StartEnrollment(
-        &device_management_service_, enrollment_config, token,
+        &device_management_service_, fake_ad_join_delegate_.get(),

[Thiemo Nagel, 2017/02/14 16:43:06]

nullptr?

[Roman Sorokin (ftl), 2017/02/15 14:01:45]

Done.

+        enrollment_config, token,
         base::Bind(&DeviceCloudPolicyManagerChromeOSEnrollmentTest::Done,
                    base::Unretained(this)));
     base::RunLoop().RunUntilIdle();