Chromad: Use DM server reply to determine enrollment type

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace policy {
 class PolicyOAuth2TokenFetcher;
 }
 
 namespace chromeos {
 
 class EnterpriseEnrollmentHelperImpl : public EnterpriseEnrollmentHelper {
  public:
   EnterpriseEnrollmentHelperImpl(
       EnrollmentStatusConsumer* status_consumer,
+      ActiveDirectoryJoinDelegate* join_delegate,

[achuithb, 2017/02/13 13:39:02]

ad_join_delegate here and everywhere else?

[Roman Sorokin (ftl), 2017/02/14 12:47:10]

Done.

       const policy::EnrollmentConfig& enrollment_config,
       const std::string& enrolling_user_domain);
   ~EnterpriseEnrollmentHelperImpl() override;
 
   // Overridden from EnterpriseEnrollmentHelper:
   void EnrollUsingAuthCode(const std::string& auth_code,
                            bool fetch_additional_token) override;
   void EnrollUsingToken(const std::string& token) override;
   void EnrollUsingAttestation() override;
   void ClearAuth(const base::Closure& callback) override;
@@ skipping 41 matching lines @@
   std::string additional_token_;
   enum {
     OAUTH_NOT_STARTED,
     OAUTH_STARTED_WITH_AUTH_CODE,
     OAUTH_STARTED_WITH_TOKEN,
     OAUTH_FINISHED
   } oauth_status_ = OAUTH_NOT_STARTED;
   bool oauth_data_cleared_ = false;
   std::string oauth_token_;
   bool success_ = false;
+  ActiveDirectoryJoinDelegate* join_delegate_;

[achuithb, 2017/02/13 13:39:02]

ad_join_delegate_?

Also, initialize to nullptr for consistency

[Roman Sorokin (ftl), 2017/02/14 12:47:10]

Done.

 
   std::unique_ptr<policy::PolicyOAuth2TokenFetcher> oauth_fetcher_;
 
   base::WeakPtrFactory<EnterpriseEnrollmentHelperImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EnterpriseEnrollmentHelperImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_IMPL_H_