Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch.

third_party/tcmalloc/chromium/src/stacktrace.cc

 // Copyright (c) 2005, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 81 matching lines @@
   GetStackFramesWithContext(void **result, int *sizes, int max_depth, \
                             int skip_count, const void *ucp)
 #include STACKTRACE_INL_HEADER
 #undef IS_STACK_FRAMES
 #undef IS_WITH_CONTEXT
 #undef GET_STACK_TRACE_OR_FRAMES
 
 #elif 0
 // This is for the benefit of code analysis tools that may have
 // trouble with the computed #include above.
-# include "base/stacktrace_x86-inl.h"
-# include "base/stacktrace_libunwind-inl.h"
-# include "base/stacktrace_generic-inl.h"
-# include "base/stacktrace_powerpc-inl.h"
-# include "base/stacktrace_win32-inl.h"
+# include "stacktrace_x86-inl.h"
+# include "stacktrace_libunwind-inl.h"
+# include "stacktrace_generic-inl.h"
+# include "stacktrace_powerpc-inl.h"
+# include "stacktrace_nacl-inl.h"
+# include "stacktrace_win32-inl.h"
 #else
 # error Cannot calculate stack trace: will need to write for your environment
 #endif