Tentative fix for the crash when calling StartupAppLauncher::ContinueWithNetworkReady by clear the …

chrome/browser/chromeos/login/app_launch_controller.cc

Index: chrome/browser/chromeos/login/app_launch_controller.cc
diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc
index 041da49d36c2ef8637cca5cecef031fb0759b455..5a5a3579c434ee7c8193301e15f62b491f53fb94 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -266,7 +266,13 @@ void AppLaunchController::OnProfileLoadFailed(
   OnLaunchFailed(error);
 }
 
+void AppLaunchController::ClearNetworkWaitTimer() {
+  waiting_for_network_ = false;
+  network_wait_timer_.Stop();
+}
+
 void AppLaunchController::CleanUp() {
+  ClearNetworkWaitTimer();
   kiosk_profile_loader_.reset();
   startup_app_launcher_.reset();
   splash_wait_timer_.Stop();
@@ -370,8 +376,7 @@ void AppLaunchController::OnInstallingApp() {
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
       AppLaunchSplashScreenActor::APP_LAUNCH_STATE_INSTALLING_APPLICATION);
 
-  waiting_for_network_ = false;
-  network_wait_timer_.Stop();
+  ClearNetworkWaitTimer();
   app_launch_splash_screen_actor_->ToggleNetworkConfig(false);
 
   // We have connectivity at this point, so we can skip the network
@@ -411,6 +416,7 @@ void AppLaunchController::OnReadyToLaunch() {
     return;
   }
 
+  ClearNetworkWaitTimer();

[xiyuan, 2015/03/06 17:43:52]

Let's do this before line 403 (starting splash_wait_timer_). Just in case
network state changed before we do launch and we are not actually handling that
right now when we are ready to launch.

[jennyz, 2015/03/06 18:04:02]

Done.

   startup_app_launcher_->LaunchApp();
 }