Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 02bf9050769e90747df1db096173b2bda5be60c1..91d711c7e55bad50ab602553faef197ce4c9260b 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -131,7 +131,7 @@ |
#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) |
@@ -681,7 +681,7 @@ std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName( |
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()); |
@@ -1588,13 +1588,11 @@ bool ChromeContentBrowserClient::AllowSocketAPI( |
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 s
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(); |
} |
@@ -1602,16 +1600,16 @@ int ChromeContentBrowserClient::GetCrashSignalFD( |
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; |