Upstream native crash handling changes for Android.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 113 matching lines @@
 #if defined(USE_AURA)
 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
 #endif
 
 #if defined(USE_ASH)
 #include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "base/linux_util.h"
-#include "chrome/browser/crash_handler_host_linux.h"
+#include "chrome/browser/crash_handler_host_posix.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_gtk.h"
 #endif
 #if defined(USE_NSS)
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #endif
 
 using content::AccessTokenStore;
@@ skipping 529 matching lines @@
   return false;
 }
 
 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(
     const std::string& alias_name) {
   return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name);
 }
 
 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
     CommandLine* command_line, int child_process_id) {
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
   if (IsCrashReporterEnabled()) {
     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
         child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
   }
 #elif defined(OS_MACOSX)
   if (IsCrashReporterEnabled()) {
     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
                                     child_process_logging::GetClientId());
   }
 #endif  // OS_MACOSX
@@ skipping 885 matching lines @@
 
   if (extension->HasAPIPermission(ExtensionAPIPermission::kSocket))
     return true;
 
   return false;
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 int ChromeContentBrowserClient::GetCrashSignalFD(
     const CommandLine& command_line) {
 #if defined(OS_ANDROID)

[Yaron, 2012/04/04 21:41:04]

I didn't mean to get rid of just the TODO... You should also get rid of the
#ifdef 

[carlosvaldivia, 2012/04/04 21:54:09]

Done.

-  // TODO(carlosvaldivia): Upstream breakpad code for Android and remove this
-  // fork. http://crbug.com/113560
   NOTIMPLEMENTED();
 #else
   if (command_line.HasSwitch(switches::kExtensionProcess)) {
-    ExtensionCrashHandlerHostLinux* crash_handler =
-        ExtensionCrashHandlerHostLinux::GetInstance();
+    ExtensionCrashHandlerHostPosix* crash_handler =
+        ExtensionCrashHandlerHostPosix::GetInstance();
     return crash_handler->GetDeathSignalSocket();
   }
 
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   if (process_type == switches::kRendererProcess)
-    return RendererCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return RendererCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kPluginProcess)
-    return PluginCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return PluginCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kPpapiPluginProcess)
-    return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return PpapiCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kGpuProcess)
-    return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return GpuCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 #endif  // defined(OS_ANDROID)
 
   return -1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
   return chrome::kBrowserResourcesDll;
 }
 #endif
 
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome