kiosk: Network connectivity test during launch.

chrome/browser/chromeos/app_mode/app_launch_utils.cc

Index: chrome/browser/chromeos/app_mode/app_launch_utils.cc
diff --git a/chrome/browser/chromeos/app_mode/app_launch_utils.cc b/chrome/browser/chromeos/app_mode/app_launch_utils.cc
index 21efeb9b9f16f4db31fded9ae03a513b37495655..30b5a98d1532f22e07dac6c9d56586d533996604 100644
--- a/chrome/browser/chromeos/app_mode/app_launch_utils.cc
+++ b/chrome/browser/chromeos/app_mode/app_launch_utils.cc
@@ -31,23 +31,13 @@ class AppLaunchManager : public StartupAppLauncher::Observer {
 
   void Cleanup() { delete this; }
 
-  void OnNetworkWaitTimedout() {
-    DCHECK(waiting_for_network_);
-    LOG(ERROR) << "Timed out while waiting for network during app launch.";
-    OnLaunchFailed(KioskAppLaunchError::UNABLE_TO_INSTALL);
-  }
-
   // StartupAppLauncher::Observer overrides:
   virtual void OnLoadingOAuthFile() OVERRIDE {}
   virtual void OnInitializingTokenService() OVERRIDE {}
 
   virtual void OnInitializingNetwork() OVERRIDE {
-    waiting_for_network_ = true;
-    const int kMaxNetworkWaitSeconds = 5 * 60;
-    network_wait_timer_.Start(
-        FROM_HERE,
-        base::TimeDelta::FromSeconds(kMaxNetworkWaitSeconds),
-        this, &AppLaunchManager::OnNetworkWaitTimedout);
+    // This is on crash-restart path and assumes network is online.
+    startup_app_launcher_->ContinueWithNetworkReady();

[zel, 2013/11/20 19:21:21]

what if we crashed before we managed to connect to the network?

[Tim Song, 2013/11/21 01:12:17]

When we are waiting on the network in the splash screen, the kiosk user is
logged in but the session is not started. What will crash recovery do in this
case?

[xiyuan, 2013/11/21 22:39:39]

Talked to zel and we probably would get rid of the crash-restart path and always
restart the whole session for kiosk. Filed http://crbug.com/321858.

   }
 
   virtual void OnInstallingApp() OVERRIDE {