Revert 184797

Looks like this might be causing builds to timeout.  See http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%281%29/builds/36513

> GTTF: symbolize stack traces on Mac OS X even on crash
> 
> This uses unsafe dladdr until a better solution is created.
> 
> BUG=none
> 
> Review URL: https://codereview.chromium.org/12180011

TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/12334112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184856 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 63 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 2a876c8..a17508a 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -183,7 +183,6 @@
             ],
           },
           'dependencies': [
-            'demangle',
             '../third_party/mach_override/mach_override.gyp:mach_override',
           ],
         }],
@@ -197,9 +196,6 @@
               '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
             ],
           },
-          'dependencies': [
-            'demangle',
-          ],
         }],
         ['OS != "win" and OS != "ios"', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
@@ -1156,29 +1152,6 @@
         },
       ],
     }],
-    ['OS == "mac" or OS == "ios"', {
-      'targets': [
-        {
-          'target_name': 'demangle',
-          'type': 'static_library',
-          'toolsets': ['host', 'target'],
-          'variables': {
-            'chromium_code': 0,
-          },
-          'cflags': [
-            '-Wno-sign-compare',
-          ],
-          'cflags!': [
-            '-Wextra',
-          ],
-          'sources': [
-            'third_party/symbolize/config.h',
-            'third_party/symbolize/demangle.cc',
-            'third_party/symbolize/demangle.h',
-          ],
-        },
-      ],
-    }],
     # Special target to wrap a gtest_target_type == shared_library
     # base_unittests into an android apk for execution.
     # TODO(jrg): lib.target comes from _InstallableTargetInstallPath()
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
index 253a8e2..8a8ae47 100644
--- a/base/debug/stack_trace_posix.cc
+++ b/base/debug/stack_trace_posix.cc
@@ -4,7 +4,6 @@
 
 #include "base/debug/stack_trace.h"
 
-#include <dlfcn.h>
 #include <errno.h>
 #include <execinfo.h>
 #include <fcntl.h>
@@ -37,10 +36,6 @@
 #include "base/third_party/symbolize/symbolize.h"
 #endif
 
-#if defined(OS_MACOSX)
-#include "base/third_party/symbolize/demangle.h"
-#endif
-
 namespace base {
 namespace debug {
 
@@ -148,37 +143,6 @@ void ProcessBacktrace(void *const *trace,
 
     handler->HandleOutput("\n");
   }
-#elif defined(OS_MACOSX)
-  for (int i = 0; i < size; ++i) {
-    OutputPointer(trace[i], handler);
-    handler->HandleOutput(" ");
-
-    // TODO(phajdan.jr): dladdr is not async-signal-safe. Implement our own
-    // safe solution.
-    Dl_info dlinfo;
-    if (dladdr(trace[i], &dlinfo) == 0) {
-      handler->HandleOutput("<unknown>");
-    } else {
-      char* base_name = strrchr(dlinfo.dli_fname, '/');
-      handler->HandleOutput(base_name ? base_name + 1 : dlinfo.dli_fname);
-      handler->HandleOutput("\t");
-
-      char buf[1024] = { '\0' };
-
-      if (google::Demangle(dlinfo.dli_sname, buf, sizeof(buf)))
-        handler->HandleOutput(buf);
-      else
-        handler->HandleOutput(dlinfo.dli_sname);
-
-      internal::itoa_r(
-          static_cast<char*>(trace[i]) - static_cast<char*>(dlinfo.dli_saddr),
-          buf, sizeof(buf), 10, 0);
-      handler->HandleOutput("+");
-      handler->HandleOutput(buf);
-    }
-
-    handler->HandleOutput("\n");
-  }
 #else
   bool printed = false;