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

chrome/browser/chromeos/login/screens/update_screen.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 59 matching lines @@
   void UpdateStatusChanged(const UpdateEngineClient::Status& status) override;
 
   // NetworkPortalDetector::Observer implementation:
   void OnPortalDetectionCompleted(
       const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalState& state) override;
 
   // Skip update UI, usually used only in debug builds/tests.
   void CancelUpdate();
 
+  base::OneShotTimer<UpdateScreen>& GetErrorMessageTimerForTesting();
+
  private:
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestUpdateAvailable);
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestAPReselection);
 
   enum State {
     STATE_IDLE = 0,
     STATE_FIRST_PORTAL_CHECK,
     STATE_UPDATE,
     STATE_ERROR
@@ skipping 19 matching lines @@
 
   // Returns an instance of the error screen.
   ErrorScreen* GetErrorScreen();
 
   void StartUpdateCheck();
   void ShowErrorMessage();
   void HideErrorMessage();
   void UpdateErrorMessage(
       const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalStatus status);
+
+  void DelayErrorMessage();
+
   // Timer for the interval to wait for the reboot.
   // If reboot didn't happen - ask user to reboot manually.
   base::OneShotTimer<UpdateScreen> reboot_timer_;
 
   // Returns a static InstanceSet.
   typedef std::set<UpdateScreen*> InstanceSet;
   static InstanceSet& GetInstanceSet();
 
   // Current state of the update screen.
   State state_;
@@ skipping 34 matching lines @@
   // True if there was no notification from NetworkPortalDetector
   // about state for the default network.
   bool is_first_detection_notification_;
 
   // True if there was no notification about captive portal state for
   // the default network.
   bool is_first_portal_notification_;
 
   scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;
 
+  // Timer for the captive portal detector to show portal login page.
+  // If redirect did not happen during this delay, error message is shown
+  // instead.
+  base::OneShotTimer<UpdateScreen> error_message_timer_;
+
   base::WeakPtrFactory<UpdateScreen> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_