| Index: third_party/tcmalloc/chromium/src/base/logging.h
 | 
| ===================================================================
 | 
| --- third_party/tcmalloc/chromium/src/base/logging.h	(revision 135692)
 | 
| +++ third_party/tcmalloc/chromium/src/base/logging.h	(working copy)
 | 
| @@ -45,6 +45,7 @@
 | 
|  #include <string.h>    // for strlen(), strcmp()
 | 
|  #include <assert.h>
 | 
|  #include <errno.h>     // for errno
 | 
| +#include "base/abort.h"
 | 
|  #include "base/commandlineflags.h"
 | 
|  
 | 
|  // On some systems (like freebsd), we can't call write() at all in a
 | 
| @@ -85,7 +86,7 @@
 | 
|      if (!(condition)) {                                                 \
 | 
|        WRITE_TO_STDERR("Check failed: " #condition "\n",                 \
 | 
|                        sizeof("Check failed: " #condition "\n")-1);      \
 | 
| -      abort();                                                          \
 | 
| +      Abort();                                                          \
 | 
|      }                                                                   \
 | 
|    } while (0)
 | 
|  
 | 
| @@ -95,7 +96,7 @@
 | 
|      if (!(condition)) {                                                        \
 | 
|        WRITE_TO_STDERR("Check failed: " #condition ": " message "\n",           \
 | 
|                        sizeof("Check failed: " #condition ": " message "\n")-1);\
 | 
| -      abort();                                                                 \
 | 
| +      Abort();                                                                 \
 | 
|      }                                                                          \
 | 
|    } while (0)
 | 
|  
 | 
| @@ -118,7 +119,7 @@
 | 
|                        sizeof("Check failed: " #condition ": ")-1);      \
 | 
|        WRITE_TO_STDERR(strerror(err_no), strlen(strerror(err_no)));      \
 | 
|        WRITE_TO_STDERR("\n", sizeof("\n")-1);                            \
 | 
| -      abort();                                                          \
 | 
| +      Abort();                                                          \
 | 
|      }                                                                   \
 | 
|    } while (0)
 | 
|  
 | 
| @@ -135,7 +136,7 @@
 | 
|    do {                                                                  \
 | 
|      if (!((val1) op (val2))) {                                          \
 | 
|        fprintf(stderr, "Check failed: %s %s %s\n", #val1, #op, #val2);   \
 | 
| -      abort();                                                          \
 | 
| +      Abort();                                                          \
 | 
|      }                                                                   \
 | 
|    } while (0)
 | 
|  
 | 
| @@ -205,7 +206,7 @@
 | 
|    }
 | 
|    WRITE_TO_STDERR(buf, strlen(buf));
 | 
|    if ((severity) == FATAL)
 | 
| -    abort(); // LOG(FATAL) indicates a big problem, so don't run atexit() calls
 | 
| +    Abort(); // LOG(FATAL) indicates a big problem, so don't run atexit() calls
 | 
|  }
 | 
|  
 | 
|  // Note that since the order of global constructors is unspecified,
 | 
| 
 |