Don't start FRE from the login screen

chrome/browser/chromeos/login/enrollment/auto_enrollment_check_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/enrollment/auto_enrollment_check_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 96 matching lines @@
   policy::AutoEnrollmentState new_auto_enrollment_state =
       auto_enrollment_controller_->state();
 
   if (!UpdateCaptivePortalStatus(new_captive_portal_status))
     UpdateAutoEnrollmentState(new_auto_enrollment_state);
 
   captive_portal_status_ = new_captive_portal_status;
   auto_enrollment_state_ = new_auto_enrollment_state;
 
   // Make sure gears are in motion in the background.
-  auto_enrollment_controller_->Start();
+  if (auto_enrollment_controller_->state() ==

[achuithb, 2017/04/19 19:04:43]

Why not do this state check inside Start()?

[Thiemo Nagel, 2017/04/20 13:24:00]

Done.

+      policy::AUTO_ENROLLMENT_STATE_IDLE) {
+    auto_enrollment_controller_->Start();
+  }
   network_portal_detector::GetInstance()->StartDetectionIfIdle();
 }
 
 void AutoEnrollmentCheckScreen::Hide() {
 }
 
 void AutoEnrollmentCheckScreen::OnViewDestroyed(
     AutoEnrollmentCheckScreenView* view) {
   if (view_ == view)
     view_ = nullptr;
@@ skipping 70 matching lines @@
 
   // Return is required to avoid compiler warning.
   NOTREACHED() << "Bad status " << new_captive_portal_status;
   return false;
 }
 
 bool AutoEnrollmentCheckScreen::UpdateAutoEnrollmentState(
     policy::AutoEnrollmentState new_auto_enrollment_state) {
   switch (new_auto_enrollment_state) {
     case policy::AUTO_ENROLLMENT_STATE_IDLE:
-      // The client should have been started already.
-      NOTREACHED();
-      return false;
     case policy::AUTO_ENROLLMENT_STATE_PENDING:
     case policy::AUTO_ENROLLMENT_STATE_SERVER_ERROR:
     case policy::AUTO_ENROLLMENT_STATE_TRIGGER_ENROLLMENT:
     case policy::AUTO_ENROLLMENT_STATE_NO_ENROLLMENT:
       return false;
     case policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR:
       ShowErrorScreen(NetworkError::ERROR_STATE_OFFLINE);
       return true;
   }
 
@@ skipping 47 matching lines @@
   }
   NOTREACHED();
   return false;
 }
 
 void AutoEnrollmentCheckScreen::OnConnectRequested() {
   auto_enrollment_controller_->Retry();
 }
 
 }  // namespace chromeos