ChromeOS: Do not show the error dialog when captive portal is detected in OOBE.

chrome/browser/chromeos/login/screens/update_screen_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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
@@ skipping 222 matching lines @@
   EXPECT_CALL(*mock_base_screen_delegate_,
               OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
   update_screen_->CancelUpdate();
 
   // Change ethernet state to portal.
   NetworkPortalDetector::CaptivePortalState portal_state;
   portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
   SetDetectionResults(kStubEthernetGuid, portal_state);
 
-  // Update screen will show error message about portal state because
+  // Update screen will delay error message about portal state because
   // ethernet is behind captive portal.
   EXPECT_CALL(*mock_error_screen_,
               MockSetUIState(NetworkError::UI_STATE_UPDATE)).Times(1);
   EXPECT_CALL(*mock_error_screen_,
               MockSetErrorState(NetworkError::ERROR_STATE_PORTAL,
                                 std::string())).Times(1);
   EXPECT_CALL(*mock_error_screen_, MockFixCaptivePortal()).Times(1);
   EXPECT_CALL(*mock_base_screen_delegate_, ShowErrorScreen()).Times(1);
 
   update_screen_->StartNetworkCheck();
 
+  // Force timer expiration.
+  {
+    base::Closure timed_callback =
+        update_screen_->GetErrorMessageTimerForTesting().user_task();
+    ASSERT_FALSE(timed_callback.is_null());
+    update_screen_->GetErrorMessageTimerForTesting().Reset();
+    timed_callback.Run();
+  }
+
   NetworkPortalDetector::CaptivePortalState online_state;
   online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
   online_state.response_code = 204;
   SetDetectionResults(kStubEthernetGuid, online_state);
 
   // Second notification from portal detector will be about online state,
   // so update screen will hide error message and proceed to update.
   EXPECT_CALL(*mock_base_screen_delegate_, HideErrorScreen(update_screen_))
       .Times(1);
   fake_update_engine_client_->set_update_check_result(
@@ skipping 10 matching lines @@
   EXPECT_CALL(*mock_base_screen_delegate_,
               OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
   update_screen_->CancelUpdate();
 
   // Change ethernet state to portal.
   NetworkPortalDetector::CaptivePortalState portal_state;
   portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
   SetDetectionResults(kStubEthernetGuid, portal_state);
 
-  // Update screen will show error message about portal state because
+  // Update screen will delay error message about portal state because
   // ethernet is behind captive portal.
   EXPECT_CALL(*mock_error_screen_,
               MockSetUIState(NetworkError::UI_STATE_UPDATE)).Times(1);
   EXPECT_CALL(*mock_error_screen_,
               MockSetErrorState(NetworkError::ERROR_STATE_PORTAL,
                                 std::string())).Times(1);
   EXPECT_CALL(*mock_error_screen_, MockFixCaptivePortal()).Times(1);
   EXPECT_CALL(*mock_base_screen_delegate_, ShowErrorScreen()).Times(1);
 
   update_screen_->StartNetworkCheck();
 
+  // Force timer expiration.
+  {
+    base::Closure timed_callback =
+        update_screen_->GetErrorMessageTimerForTesting().user_task();
+    ASSERT_FALSE(timed_callback.is_null());
+    update_screen_->GetErrorMessageTimerForTesting().Reset();
+    timed_callback.Run();
+  }
+
   // Change active network to the wifi behind proxy.
   NetworkPortalDetector::CaptivePortalState proxy_state;
   proxy_state.status =
       NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
   proxy_state.response_code = -1;
   SetDefaultNetwork(kStubWifiGuid);
   SetDetectionResults(kStubWifiGuid, proxy_state);
 
   // Update screen will show message about proxy error because wifie
   // network requires proxy authentication.
@@ skipping 35 matching lines @@
   EXPECT_CALL(*mock_base_screen_delegate_,
               OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
   update_screen_->CancelUpdate();
 
   // Change ethernet state to portal.
   NetworkPortalDetector::CaptivePortalState portal_state;
   portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
   SetDetectionResults(kStubEthernetGuid, portal_state);
 
-  // Update screen will show error message about portal state because
+  // Update screen will delay error message about portal state because
   // ethernet is behind captive portal.
   EXPECT_CALL(*mock_error_screen_,
               MockSetUIState(NetworkError::UI_STATE_UPDATE)).Times(1);
   EXPECT_CALL(*mock_error_screen_,
               MockSetErrorState(NetworkError::ERROR_STATE_PORTAL,
                                 std::string())).Times(1);
   EXPECT_CALL(*mock_error_screen_, MockFixCaptivePortal()).Times(1);
   EXPECT_CALL(*mock_base_screen_delegate_, ShowErrorScreen()).Times(1);
 
   update_screen_->StartNetworkCheck();
 
+  // Force timer expiration.
+  {
+    base::Closure timed_callback =
+        update_screen_->GetErrorMessageTimerForTesting().user_task();
+    ASSERT_FALSE(timed_callback.is_null());
+    update_screen_->GetErrorMessageTimerForTesting().Reset();
+    timed_callback.Run();
+  }
+
   // User re-selects the same network manually. In this case, hide
   // offline message and skip network check. Since ethernet is still
   // behind portal, update engine fails to update.
   EXPECT_CALL(*mock_base_screen_delegate_, HideErrorScreen(update_screen_))
       .Times(1);
   fake_update_engine_client_->set_update_check_result(
       chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
   EXPECT_CALL(*mock_base_screen_delegate_,
               OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
                      _)).Times(1);
 
   update_screen_->OnConnectToNetworkRequested();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace chromeos