Chromad: Use DM server reply to determine enrollment type

chrome/browser/chromeos/login/screens/host_pairing_screen.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
+#include "chrome/browser/chromeos/policy/fake_active_directory_join_delegate.h"
 #include "components/pairing/host_pairing_controller.h"
 
 namespace chromeos {
 
 using namespace host_pairing;
 using namespace pairing_chromeos;
 
 HostPairingScreen::HostPairingScreen(
     BaseScreenDelegate* base_screen_delegate,
     Delegate* delegate,
     HostPairingScreenActor* actor,
     pairing_chromeos::HostPairingController* remora_controller)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_OOBE_HOST_PAIRING),
       delegate_(delegate),
       actor_(actor),
       remora_controller_(remora_controller),
-      current_stage_(HostPairingController::STAGE_NONE),
       weak_ptr_factory_(this) {
   actor_->SetDelegate(this);
   remora_controller_->AddObserver(this);
 }
 
 HostPairingScreen::~HostPairingScreen() {
   if (actor_)
     actor_->SetDelegate(NULL);
   remora_controller_->RemoveObserver(this);
 }
@@ skipping 98 matching lines @@
 void HostPairingScreen::AddNetworkRequested(const std::string& onc_spec) {
   if (delegate_)
     delegate_->AddNetworkRequested(onc_spec);
 }
 
 void HostPairingScreen::EnrollHostRequested(const std::string& auth_token) {
   policy::EnrollmentConfig enrollment_config =
       g_browser_process->platform_part()
           ->browser_policy_connector_chromeos()
           ->GetPrescribedEnrollmentConfig();
+  fake_ad_join_delegate_ = base::MakeUnique<FakeActiveDirectoryJoinDelegate>();
   enrollment_helper_ = EnterpriseEnrollmentHelper::Create(
-      this, enrollment_config, std::string());
+      this, fake_ad_join_delegate_.get(), enrollment_config, std::string());

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

Maybe I'm missing something, but couldn't you just pass in a nullptr?

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

Done.

   enrollment_helper_->EnrollUsingToken(auth_token);
   remora_controller_->OnEnrollmentStatusChanged(
       HostPairingController::ENROLLMENT_STATUS_ENROLLING);
 }
 
 void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) {
   if (actor_ == actor)
     actor_ = NULL;
 }
 
@@ skipping 34 matching lines @@
 }
 
 void HostPairingScreen::OnAnyEnrollmentError() {
   enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared,
                                            weak_ptr_factory_.GetWeakPtr()));
   remora_controller_->OnEnrollmentStatusChanged(
       HostPairingController::ENROLLMENT_STATUS_FAILURE);
 }
 
 }  // namespace chromeos