Appropriate handling for Cellular First devices.

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index ebebd51e98a5ca380df8ab5b95692acb27c84ed9..c266a087a7e05055aa5536b3f316be0e9aa84a7f 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -1301,6 +1301,68 @@ IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
   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) {

[xiyuan, 2017/02/28 20:26:41]

I am not sure how this test differs from ControlFlowMain. The test case below
looks the same to me.

[kumarniranjan, 2017/02/28 21:49:33]

As we discussed, it is the same test, and it has been refactored to avoid code
duplication.

+  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_, BaseScreenDelegate::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_, BaseScreenDelegate::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_, BaseScreenDelegate::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_,
+         BaseScreenDelegate::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()));
+}
+
 // TODO(dzhioev): Add test emaulating device with wrong HWID.
 
 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571