diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 18:36:33 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 18:36:33 +0000 |
| commit | 50cdead453a66955b443060b338c7232fe03fc34 (patch) | |
| tree | 2671dc2884531f3a7b65442eea1eadd9c0a86005 /content/renderer | |
| parent | e0521140e09b03dca21735082e672e3bbaf908e8 (diff) | |
| download | chromium_src-50cdead453a66955b443060b338c7232fe03fc34.zip chromium_src-50cdead453a66955b443060b338c7232fe03fc34.tar.gz chromium_src-50cdead453a66955b443060b338c7232fe03fc34.tar.bz2 | |
Replace all uses of base/mac/crash_logging.h with base/debug/crash_logging.h.
This also centralizes most crash keys into a constants file.
BUG=77656
Review URL: https://codereview.chromium.org/11734011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/plugin_channel_host.cc | 10 | ||||
| -rw-r--r-- | content/renderer/renderer_main_platform_delegate_mac.mm | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index 5d251b6..b9450b60 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -27,8 +27,8 @@ // the backtrace from any such nested call should be sufficient to // drive a repro. #if defined(OS_MACOSX) +#include "base/debug/crash_logging.h" #include "base/debug/stack_trace.h" -#include "base/mac/crash_logging.h" #include "base/sys_string_conversions.h" namespace { @@ -169,8 +169,8 @@ void PluginChannelHost::RemoveRoute(int route_id) { base::debug::StackTrace trace; size_t count = 0; const void* const* addresses = trace.Addresses(&count); - base::mac::SetCrashKeyFromAddresses( - base::SysUTF8ToNSString(kRemoveRouteTraceKey), addresses, count); + base::debug::SetCrashKeyFromAddresses( + kRemoveRouteTraceKey, addresses, count); } #endif @@ -214,8 +214,8 @@ void PluginChannelHost::OnChannelError() { base::debug::StackTrace trace; size_t count = 0; const void* const* addresses = trace.Addresses(&count); - base::mac::SetCrashKeyFromAddresses( - base::SysUTF8ToNSString(kChannelErrorTraceKey), addresses, count); + base::debug::SetCrashKeyFromAddresses( + kChannelErrorTraceKey, addresses, count); } #endif diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm index 1e87401..96cde25 100644 --- a/content/renderer/renderer_main_platform_delegate_mac.mm +++ b/content/renderer/renderer_main_platform_delegate_mac.mm @@ -11,7 +11,6 @@ #include "base/command_line.h" #include "base/logging.h" #import "base/mac/foundation_util.h" -#import "base/mac/crash_logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "content/common/sandbox_mac.h" |