This adds a recovery mode to the diagnostics

chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 56 matching lines @@
 
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
 #include "components/nacl/common/nacl_paths.h"
 #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chromeos/chromeos_paths.h"
+#include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/common/descriptors_android.h"
 #else
 // Diagnostics is only available on non-android platforms.
 #include "chrome/browser/diagnostics/diagnostics_controller.h"
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
 #endif
 
@@ skipping 326 matching lines @@
     }
 
     diagnostics::DiagnosticsWriter writer(format);
     *exit_code = diagnostics::DiagnosticsController::GetInstance()->Run(
         command_line, &writer);
     diagnostics::DiagnosticsController::GetInstance()->ClearResults();
     return true;
   }
 #endif
 
+#if defined(OS_CHROMEOS)
+  // If we are recovering from a crash on ChromeOS, then we will do some
+  // recovery using the diagnostics module, and then continue on. We fake up a
+  // command line to tell it that we want it to recover, and to preserve the
+  // original command line.
+  if (command_line.HasSwitch(chromeos::switches::kLoginUser) ||
+      command_line.HasSwitch(switches::kDiagnosticsRecovery)) {
+    CommandLine interim_command_line(command_line.GetProgram());
+    if (command_line.HasSwitch(switches::kUserDataDir)) {
+      interim_command_line.AppendSwitchPath(
+          switches::kUserDataDir,
+          command_line.GetSwitchValuePath(switches::kUserDataDir));
+    }
+    interim_command_line.AppendSwitch(switches::kDiagnostics);
+    interim_command_line.AppendSwitch(switches::kDiagnosticsRecovery);
+
+    diagnostics::DiagnosticsWriter::FormatType format =
+        diagnostics::DiagnosticsWriter::LOG;
+    if (command_line.HasSwitch(switches::kDiagnosticsFormat)) {
+      std::string format_str =
+          command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
+      if (format_str == "machine") {
+        format = diagnostics::DiagnosticsWriter::MACHINE;
+      } else if (format_str == "human") {
+        format = diagnostics::DiagnosticsWriter::HUMAN;
+      } else {
+        DCHECK_EQ("log", format_str);
+      }
+    }
+
+    diagnostics::DiagnosticsWriter writer(format);
+    int diagnostics_exit_code =
+        diagnostics::DiagnosticsController::GetInstance()->Run(command_line,
+                                                               &writer);
+    if (diagnostics_exit_code) {
+      // Diagnostics has failed somehow, so we exit.
+      *exit_code = diagnostics_exit_code;
+      return true;
+    }
+
+    // Now we run the actual recovery tasks.
+    int recovery_exit_code =
+        diagnostics::DiagnosticsController::GetInstance()->RunRecovery(
+            command_line, &writer);
+
+    if (recovery_exit_code) {
+      // Recovery has failed somehow, so we exit.
+      *exit_code = recovery_exit_code;
+      return true;
+    }
+  }
+#endif
+
   content::SetContentClient(&chrome_content_client_);
 
   return false;
 }
 
 #if defined(OS_MACOSX)
 void ChromeMainDelegate::InitMacCrashReporter(const CommandLine& command_line,
                                               const std::string& process_type) {
   // TODO(mark): Right now, InitCrashReporter() needs to be called after
   // CommandLine::Init() and chrome::RegisterPathProvider().  Ideally,
@@ skipping 356 matching lines @@
 }
 
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return &g_chrome_content_utility_client.Get();
 #endif
 }