kiosk: Network connectivity test during launch.

chrome/browser/chromeos/app_mode/app_launch_utils.cc

 // Copyright 2013 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 "chrome/browser/chromeos/app_mode/app_launch_utils.h"
 
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 13 matching lines @@
   void Start() {
     startup_app_launcher_->AddObserver(this);
     startup_app_launcher_->Initialize();
   }
 
  private:
   virtual ~AppLaunchManager() {}
 
   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 {
     waiting_for_network_ = false;
     network_wait_timer_.Stop();
   }
 
   virtual void OnReadyToLaunch() OVERRIDE {
     startup_app_launcher_->LaunchApp();
   }
@@ skipping 11 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AppLaunchManager);
 };
 
 void LaunchAppOrDie(Profile* profile, const std::string& app_id) {
   // AppLaunchManager manages its own lifetime.
   (new AppLaunchManager(profile, app_id))->Start();
 }
 
 }  // namespace chromeos