Mop up incorrect uses of IsEnterpriseManaged()

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.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/enrollment/enterprise_enrollment_helper_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 128 matching lines @@
 }
 
 void EnterpriseEnrollmentHelperImpl::DoEnroll(const std::string& token) {
   DCHECK(token == oauth_token_ || oauth_token_.empty());
   DCHECK(enrollment_config_.is_mode_attestation() ||
          oauth_status_ == OAUTH_STARTED_WITH_AUTH_CODE ||
          oauth_status_ == OAUTH_STARTED_WITH_TOKEN);
   oauth_token_ = token;
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  if (connector->IsEnterpriseManaged() &&
+  // Re-enrollment not (yet?) supported for Active Directory.

[achuithb, 2016/11/25 10:10:48]

Is this intended to be a TODO? If so, we should add a bug. Otherwise, is it
useful?

[Thiemo Nagel, 2016/11/25 14:26:10]

Good point.  It's not intended as a TODO.  I've changed the text to "not
implemented" to clarify that re-enrollment for AD is not disabled for
fundamental reasons but only due to low priority. ;)

+  if (connector->IsCloudManaged() &&
       connector->GetEnterpriseDomain() != enrolling_user_domain_) {
     LOG(ERROR) << "Trying to re-enroll to a different domain than "
                << connector->GetEnterpriseDomain();
     UMA(policy::kMetricEnrollmentPrecheckDomainMismatch);
     if (oauth_status_ != OAUTH_NOT_STARTED)
       oauth_status_ = OAUTH_FINISHED;
     status_consumer()->OnOtherError(OTHER_ERROR_DOMAIN_MISMATCH);
     return;
   }
 
@@ skipping 267 matching lines @@
   EnrollmentUMA(sample, enrollment_config_.mode);
 }
 
 void EnterpriseEnrollmentHelperImpl::OnSigninProfileCleared(
     const base::Closure& callback) {
   oauth_data_cleared_ = true;
   callback.Run();
 }
 
 }  // namespace chromeos