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

3 files changed, 0 insertions, 102 deletions

diff --git a/base/base.gypi b/base/base.gypi
index 69a844e..2ee97d3 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -208,8 +208,6 @@
           'mac/bundle_locations.h',
           'mac/bundle_locations.mm',
           'mac/cocoa_protocols.h',
-          'mac/crash_logging.h',
-          'mac/crash_logging_mac.mm',
           'mac/foundation_util.h',
           'mac/foundation_util.mm',
           'mac/launchd.cc',
diff --git a/base/mac/crash_logging.h b/base/mac/crash_logging.h
deleted file mode 100644
index 837a044..0000000
--- a/base/mac/crash_logging.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// 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 BASE_MAC_CRASH_LOGGING_H_
-#define BASE_MAC_CRASH_LOGGING_H_
-
-#include "base/base_export.h"
-
-#if __OBJC__
-#import "base/memory/scoped_nsobject.h"
-
-@class NSString;
-#else
-class NSString;
-#endif
-
-// !!! DEPRECATED !!!!
-// Please use base/debug/crash_logging.h instead.
-//
-// TODO(rsesek): Convert all callers to the new API.
-
-namespace base {
-namespace mac {
-
-// Set and clear meta information for Minidump.
-// IMPORTANT: On OS X, the key/value pairs are sent to the crash server
-// out of bounds and not recorded on disk in the minidump, this means
-// that if you look at the minidump file locally you won't see them!
-BASE_EXPORT void SetCrashKeyValue(NSString* key, NSString* val);
-BASE_EXPORT void ClearCrashKey(NSString* key);
-
-// Format |count| items from |addresses| using %p, and set the
-// resulting string as value for crash key |key|.  A maximum of 23
-// items will be encoded, since breakpad limits values to 255 bytes.
-BASE_EXPORT void SetCrashKeyFromAddresses(NSString* key,
-                                          const void* const* addresses,
-                                          size_t count);
-
-#if __OBJC__
-
-class BASE_EXPORT ScopedCrashKey {
- public:
-  ScopedCrashKey(NSString* key, NSString* value);
-  ~ScopedCrashKey();
- private:
-  scoped_nsobject<NSString> crash_key_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedCrashKey);
-};
-
-#endif  // __OBJC__
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // BASE_MAC_CRASH_LOGGING_H_
diff --git a/base/mac/crash_logging_mac.mm b/base/mac/crash_logging_mac.mm
deleted file mode 100644
index 85e5202..0000000
--- a/base/mac/crash_logging_mac.mm
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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 "base/mac/crash_logging.h"
-
-#import <Foundation/Foundation.h>
-
-#include "base/debug/crash_logging.h"
-#include "base/sys_string_conversions.h"
-
-namespace base {
-namespace mac {
-
-void SetCrashKeyValue(NSString* key, NSString* val) {
-  base::debug::SetCrashKeyValue(
-      base::SysNSStringToUTF8(key),
-      base::SysNSStringToUTF8(val));
-}
-
-void ClearCrashKey(NSString* key) {
-  base::debug::ClearCrashKey(base::SysNSStringToUTF8(key));
-}
-
-void SetCrashKeyFromAddresses(NSString* key,
-                              const void* const* addresses,
-                              size_t count) {
-  base::debug::SetCrashKeyFromAddresses(
-      base::SysNSStringToUTF8(key),
-      addresses,
-      count);
-}
-
-ScopedCrashKey::ScopedCrashKey(NSString* key, NSString* value)
-    : crash_key_([key retain]) {
-  SetCrashKeyValue(key, value);
-}
-
-ScopedCrashKey::~ScopedCrashKey() {
-  ClearCrashKey(crash_key_);
-}
-
-}  // namespace mac
-}  // namespace base