Appropriate handling for Cellular First devices.

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

 // Copyright (c) 2012 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/wizard_controller.h"
 
 #include "ash/common/accessibility_types.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 498 matching lines @@
       return;
 
     runner->Run();
   }
 
   void ResetAutoEnrollmentCheckScreen() {
     WizardController::default_controller()->screens_.erase(
         OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK);
   }
 
+  void TestControlFlowMain() {
+    CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
+
+    WaitUntilJSIsReady();
+
+    // Check visibility of the header bar.
+    ASSERT_FALSE(JSExecuteBooleanExpression("$('login-header-bar').hidden"));
+
+    EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
+    EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
+    OnExit(*mock_network_screen_, ScreenExitCode::NETWORK_CONNECTED);
+
+    CheckCurrentScreen(OobeScreen::SCREEN_OOBE_EULA);
+
+    // Header bar should still be visible.
+    ASSERT_FALSE(JSExecuteBooleanExpression("$('login-header-bar').hidden"));
+
+    EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
+    EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
+    EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
+    // Enable TimeZone resolve
+    InitTimezoneResolver();
+    OnExit(*mock_eula_screen_, ScreenExitCode::EULA_ACCEPTED);
+    EXPECT_TRUE(GetGeolocationProvider());
+
+    // Let update screen smooth time process (time = 0ms).
+    content::RunAllPendingInMessageLoop();
+
+    CheckCurrentScreen(OobeScreen::SCREEN_OOBE_UPDATE);
+    EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
+    EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
+    OnExit(*mock_update_screen_, ScreenExitCode::UPDATE_INSTALLED);
+
+    CheckCurrentScreen(OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK);
+    EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
+    EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
+    OnExit(*mock_auto_enrollment_check_screen_,
+           ScreenExitCode::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+
+    EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
+    EXPECT_EQ("ethernet,wifi,cellular", NetworkHandler::Get()
+                                            ->network_state_handler()
+                                            ->GetCheckPortalListForTest());
+
+    WaitUntilTimezoneResolved();
+    EXPECT_EQ(
+        "America/Anchorage",
+        base::UTF16ToUTF8(chromeos::system::TimezoneSettings::GetInstance()
+                              ->GetCurrentTimezoneID()));
+  }
+
   linked_ptr<MockNetworkScreen> mock_network_screen_;
   MockOutShowHide<MockUpdateScreen, MockUpdateView>* mock_update_screen_;
   MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
   MockOutShowHide<MockEnrollmentScreen, MockEnrollmentScreenView>*
       mock_enrollment_screen_;
   MockOutShowHide<MockAutoEnrollmentCheckScreen,
                   MockAutoEnrollmentCheckScreenView>*
       mock_auto_enrollment_check_screen_;
   MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenView>*
       mock_wrong_hwid_screen_;
   MockOutShowHide<MockEnableDebuggingScreen, MockEnableDebuggingScreenView>*
       mock_enable_debugging_screen_;
   std::unique_ptr<MockDeviceDisabledScreenView> device_disabled_screen_view_;
 
  private:
   NetworkPortalDetectorTestImpl* network_portal_detector_;
 
   // Use a test factory as a fallback so we don't have to deal with other
   // requests.
   std::unique_ptr<WizardControllerTestURLFetcherFactory>
       fallback_fetcher_factory_;
   std::unique_ptr<net::FakeURLFetcherFactory> fetcher_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardControllerFlowTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
-
-  WaitUntilJSIsReady();
-
-  // Check visibility of the header bar.
-  ASSERT_FALSE(JSExecuteBooleanExpression("$('login-header-bar').hidden"));
-
-  EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
-  OnExit(*mock_network_screen_, ScreenExitCode::NETWORK_CONNECTED);
-
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_EULA);
-
-  // Header bar should still be visible.
-  ASSERT_FALSE(JSExecuteBooleanExpression("$('login-header-bar').hidden"));
-
-  EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
-  EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
-  // Enable TimeZone resolve
-  InitTimezoneResolver();
-  OnExit(*mock_eula_screen_, ScreenExitCode::EULA_ACCEPTED);
-  EXPECT_TRUE(GetGeolocationProvider());
-
-  // Let update screen smooth time process (time = 0ms).
-  content::RunAllPendingInMessageLoop();
-
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_UPDATE);
-  EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
-  OnExit(*mock_update_screen_, ScreenExitCode::UPDATE_INSTALLED);
-
-  CheckCurrentScreen(OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK);
-  EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
-  EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
-  OnExit(*mock_auto_enrollment_check_screen_,
-         ScreenExitCode::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
-
-  EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
-  EXPECT_EQ("ethernet,wifi,cellular",
-            NetworkHandler::Get()->network_state_handler()
-            ->GetCheckPortalListForTest());
-
-  WaitUntilTimezoneResolved();
-  EXPECT_EQ("America/Anchorage",
-            base::UTF16ToUTF8(chromeos::system::TimezoneSettings::GetInstance()
-                                  ->GetCurrentTimezoneID()));
+  TestControlFlowMain();
 }
 
 // This test verifies that if WizardController fails to apply a non-critical
 // update before the OOBE is marked complete, it allows the user to proceed to
 // log in.
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
                        ControlFlowErrorUpdateNonCriticalUpdate) {
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
@@ skipping 689 matching lines @@
   WizardController::default_controller()->AdvanceToScreen(
       OobeScreen::SCREEN_OOBE_ENROLLMENT);
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT);
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
                        ControlFlowResumeInterruptedOobe) {
   EXPECT_EQ(OobeScreen::SCREEN_OOBE_ENROLLMENT, GetFirstScreen());
 }
 
+class WizardControllerCellularFirstTest : public WizardControllerFlowTest {
+ protected:
+  WizardControllerCellularFirstTest() {}
+
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    command_line->AppendSwitch(switches::kCellularFirst);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WizardControllerCellularFirstTest);
+};
+
+IN_PROC_BROWSER_TEST_F(WizardControllerCellularFirstTest, CellularFirstFlow) {
+  TestControlFlowMain();
+}
+
 // TODO(dzhioev): Add test emaulating device with wrong HWID.
 
 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
 
 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
 // UI and logic is ready. http://crbug.com/127016
 
 // TODO(dzhioev): Add tests for controller/host pairing flow.
 // http://crbug.com/375191
 
 // TODO(khmel): Add tests for ARC OptIn flow.
 // http://crbug.com/651144
 static_assert(static_cast<int>(ScreenExitCode::EXIT_CODES_COUNT) == 25,
               "tests for new control flow are missing");
 
 }  // namespace chromeos