Add the ability to show a demo app on OOBE if a machine is derelict.

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 56 matching lines @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_controller.h"
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
+#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 #include "ui/events/x/touch_factory_x11.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/startup/startup_browser_creator_win.h"
 #endif
@@ skipping 520 matching lines @@
 
   if (chrome::IsRunningInAppMode() &&
       command_line.HasSwitch(switches::kAppId)) {
     chromeos::LaunchAppOrDie(
         last_used_profile,
         command_line.GetSwitchValueASCII(switches::kAppId));
 
     // Skip browser launch since app mode launches its app window.
     silent_launch = true;
   }
+
+  // If we are a demo app session and we crashed, there is no safe recovery
+  // possible. We should instead cleanly exit and go back to the OOBE screen,
+  // where we will launch again after the timeout has expired.
+  if (chromeos::DemoAppLauncher::IsDemoAppSession(
+      command_line.GetSwitchValueASCII(chromeos::switches::kLoginUser))) {
+    chrome::AttemptUserExit();

[bartfab (slow), 2014/02/13 19:51:53]

Have you tested this? In my experience, Chrome is unable to shut down cleanly in
the first few seconds after launch because too many start-up tasks are still
running that do not expect to be torn down in mid-flight. I would expect
AttemptUserExit() to crash Chrome, probably leading to a crash loop.

[rkc, 2014/02/13 23:22:01]

Yes, multiple times. Works fine.
If you also look at the code above for "chromeos::LaunchAppOrDie", if we are
unable to launch the app, we do AttemptUserExit there too.

Additionally, AttemptUserExit doesn't actually close the browser, but instead
notifies Session Manager that our session is over and requests that it terminate
us. In case Chrome 'does' crash due to any reason at this point, we won't have a
crash loop since SessionManager already knows that our session is over and will
bring us back to OOBE again.

+    return false;
+  }
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 
   if (!process_startup &&
       command_line.HasSwitch(switches::kDumpBrowserHistograms)) {
     // Only handle --dump-browser-histograms from a rendezvous. In this case, do
     // not open a new browser window even if no output file was given.
@@ skipping 177 matching lines @@
   }
 
   if (command_line.HasSwitch(switches::kProfileDirectory)) {
     return user_data_dir.Append(
         command_line.GetSwitchValuePath(switches::kProfileDirectory));
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(
       user_data_dir);
 }