Don't start FRE from the login screen

chrome/browser/chromeos/login/wizard_controller.h

Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 153752cfc5d5a1ec1b90beec060130cf2d1ccb6d..9a336cf8b9a71e0e04afbe67f61727b6adfab915 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -27,6 +27,7 @@
 #include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
+#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 
 class PrefService;
@@ -39,6 +40,7 @@ class SharkConnectionListener;
 
 namespace chromeos {
 
+class AutoEnrollmentController;
 class ErrorScreen;
 struct Geoposition;
 class LoginDisplayHost;
@@ -305,6 +307,11 @@ class WizardController : public BaseScreenDelegate,
   // attestation-based enrollment if appropriate.
   void StartEnrollmentScreen(bool force_interactive);
 
+  // Returns auto enrollment controller (lazily initializes one if it doesn't
+  // exist already).
+  AutoEnrollmentController* GetAutoEnrollmentController();
+
+  std::unique_ptr<AutoEnrollmentController> auto_enrollment_controller_;
   std::unique_ptr<ScreenManager> screen_manager_;
 
   // Whether to skip any screens that may normally be shown after login
@@ -379,10 +386,13 @@ class WizardController : public BaseScreenDelegate,
 
   FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerDeviceStateTest,
+                           ControlFlowNoForcedReEnrollmentOnFirstBoot);
+  friend class WizardControllerBrokenLocalStateTest;
   friend class WizardControllerFlowTest;
   friend class WizardControllerOobeResumeTest;
   friend class WizardInProcessBrowserTest;
-  friend class WizardControllerBrokenLocalStateTest;
+  friend void WaitForAutoEnrollmentState(policy::AutoEnrollmentState);

[achuithb, 2017/03/24 01:33:29]

Are there examples of friend functions like this? It feels like it might be
better to wrap this in a class.

[Thiemo Nagel, 2017/04/12 14:30:40]

I've counted 244 occurrences:
https://cs.chromium.org/search/?q=friend%5C+.*%5C(+-file:.*.pb.h+-file:third_...

I don't mind either way, though.  Thus I've made the free function a member of
WizardControllerDeviceStateTest.

 
   std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;