Revert 131593

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 117 matching lines @@
 #endif
 
 #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) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "base/linux_util.h"
-#include "chrome/browser/crash_handler_host_linuxish.h"
+#include "chrome/browser/crash_handler_host_linux.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 1453 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)
+  // 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();
     return crash_handler->GetDeathSignalSocket();
   }
 
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   if (process_type == switches::kRendererProcess)
     return RendererCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kPluginProcess)
     return PluginCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kPpapiPluginProcess)
     return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kGpuProcess)
     return GpuCrashHandlerHostLinux::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