Upstream crash changes for android.

chrome/browser/crash_handler_host_linuxish.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
-#define CHROME_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
+#ifndef CHROME_BROWSER_CRASH_HANDLER_HOST_LINUXISH_H_
+#define CHROME_BROWSER_CRASH_HANDLER_HOST_LINUXISH_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 
 #if defined(USE_LINUX_BREAKPAD)
 #include <sys/types.h>
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 
 class BreakpadInfo;
 
 namespace base {
 class Thread;
 }
 #endif  // defined(USE_LINUX_BREAKPAD)
 
 template <typename T> struct DefaultSingletonTraits;
 
 // This is the base class for singleton objects which crash dump renderers and
-// plugins on Linux. We perform the crash dump from the browser because it
-// allows us to be outside the sandbox.
+// plugins on Linux or Android. We perform the crash dump from the browser
+// because it allows us to be outside the sandbox.
 //
-// PluginCrashHandlerHostLinux and RendererCrashHandlerHostLinux are singletons
-// that handle plugin and renderer crashes, respectively.
+// PluginCrashHandlerHostLinux and RendererCrashHandlerHostLinux are
+// singletons that handle plugin and renderer crashes, respectively.
 //
 // Processes signal that they need to be dumped by sending a datagram over a
 // UNIX domain socket. All processes of the same type share the client end of
 // this socket which is installed in their descriptor table before exec.
 class CrashHandlerHostLinux : public MessageLoopForIO::Watcher,
                               public MessageLoop::DestructionObserver {
  public:
   // Get the file descriptor which processes should be given in order to signal
   // crashes to the browser.
   int GetDeathSignalSocket() const {
@@ skipping 130 matching lines @@
   RendererCrashHandlerHostLinux();
   virtual ~RendererCrashHandlerHostLinux();
 
 #if defined(USE_LINUX_BREAKPAD)
   virtual void SetProcessType() OVERRIDE;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(RendererCrashHandlerHostLinux);
 };
 
-#endif  // CHROME_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
+#endif  // CHROME_BROWSER_CRASH_HANDLER_HOST_LINUXISH_H_