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

chrome/browser/chromeos/login/app_launch_controller.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/login/app_launch_controller.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 248 matching lines @@
   startup_app_launcher_.reset(
       new StartupAppLauncher(profile_, app_id_, diagnostic_mode_, this));
   startup_app_launcher_->Initialize();
 }
 
 void AppLaunchController::OnProfileLoadFailed(
     KioskAppLaunchError::Error error) {
   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();
 
   if (host_)
     host_->Finalize();
 }
 
 void AppLaunchController::OnNetworkWaitTimedout() {
   DCHECK(waiting_for_network_);
@@ skipping 83 matching lines @@
 
 void AppLaunchController::OnInitializingTokenService() {
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
       AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
 }
 
 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
   // configuration dialog if it is being shown.
   if (showing_network_dialog_) {
     app_launch_splash_screen_actor_->Show(app_id_);
     showing_network_dialog_ = false;
     launch_splash_start_time_ = base::TimeTicks::Now().ToInternalValue();
   }
 }
@@ skipping 19 matching lines @@
   if (!skip_splash_wait_ && time_taken_ms < kAppInstallSplashScreenMinTimeMS) {
     splash_wait_timer_.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(
             kAppInstallSplashScreenMinTimeMS - time_taken_ms),
         this,
         &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();
 }
 
 void AppLaunchController::OnLaunchSucceeded() {
   DVLOG(1) << "Kiosk launch succeeded, wait for app window.";
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
       AppLaunchSplashScreenActor::APP_LAUNCH_STATE_WAITING_APP_WINDOW);
 
   DCHECK(!app_window_watcher_);
   app_window_watcher_.reset(new AppWindowWatcher(this, app_id_));
 }
 
 void AppLaunchController::OnLaunchFailed(KioskAppLaunchError::Error error) {
   LOG(ERROR) << "Kiosk launch failed. Will now shut down."
              << ", error=" << error;
   DCHECK_NE(KioskAppLaunchError::NONE, error);
 
   // Saves the error and ends the session to go back to login screen.
   KioskAppLaunchError::Save(error);
   chrome::AttemptUserExit();
   CleanUp();
 }
 
 bool AppLaunchController::IsShowingNetworkConfigScreen() {
   return network_config_requested_;
 }
 
 }   // namespace chromeos