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

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

Index: chrome/browser/chromeos/login/screens/update_screen.h
diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h
index e9b291e8b97defb0e77f8d6def7bcf77095d37b7..60a289dcfe1ae4f2b23c1eb6c08594d5720dfe05 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.h
+++ b/chrome/browser/chromeos/login/screens/update_screen.h
@@ -77,6 +77,8 @@ class UpdateScreen : public UpdateModel,
   // 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);
@@ -116,6 +118,9 @@ class UpdateScreen : public UpdateModel,
   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_;
@@ -170,6 +175,11 @@ class UpdateScreen : public UpdateModel,
 
   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);