Chromad: Use DM server reply to determine enrollment type

chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index 6652c6b9e495a9454085bcefd59c4ebf3dd0325d..31266384c8764d4de9ca968e9e616fba87fbdb4c 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/elapsed_timer.h"
@@ -21,7 +20,6 @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -179,14 +177,13 @@ void EnrollmentScreen::OnLoginDone(const std::string& user,
   LOG_IF(ERROR, auth_code.empty()) << "Auth code is empty.";
   elapsed_timer_.reset(new base::ElapsedTimer());
   enrolling_user_domain_ = gaia::ExtractDomainName(user);
-  auth_code_ = auth_code;
-  // TODO(rsorokin): Move ShowAdJoin after STEP_REGISTRATION
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableAd)) {
-    actor_->ShowAdJoin();
-  } else {
-    OnAdJoined("");
-  }
+  UMA(enrollment_failed_once_ ? policy::kMetricEnrollmentRestarted
+                              : policy::kMetricEnrollmentStarted);
+
+  actor_->ShowEnrollmentSpinnerScreen();
+  CreateEnrollmentHelper();
+  enrollment_helper_->EnrollUsingAuthCode(
+      auth_code, shark_controller_ != NULL /* fetch_additional_token */);

[achuithb, 2017/02/07 20:27:16]

nullptr

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

Done.

 }
 
 void EnrollmentScreen::OnRetry() {
@@ -215,19 +212,6 @@ void EnrollmentScreen::OnConfirmationClosed() {
                        BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED));
 }
 
-void EnrollmentScreen::OnAdJoined(const std::string& realm) {
-  if (!realm.empty()) {
-    config_.management_realm = realm;
-  }
-  UMA(enrollment_failed_once_ ? policy::kMetricEnrollmentRestarted
-                              : policy::kMetricEnrollmentStarted);
-
-  actor_->ShowEnrollmentSpinnerScreen();
-  CreateEnrollmentHelper();
-  enrollment_helper_->EnrollUsingAuthCode(
-      auth_code_, shark_controller_ != NULL /* fetch_additional_token */);
-}
-
 void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) {
   RecordEnrollmentErrorMetrics();
   actor_->ShowAuthError(error);