diff options
| author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 08:36:56 +0000 |
|---|---|---|
| committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 08:36:56 +0000 |
| commit | 8435cb9714b82fb0d1bba0889df939aac5a5b493 (patch) | |
| tree | f56154e219e9b54022470f10c852d1878734d11b /base/debug | |
| parent | f237c0faa440ad898c234da4b999ced61cc17b88 (diff) | |
| download | chromium_src-8435cb9714b82fb0d1bba0889df939aac5a5b493.zip chromium_src-8435cb9714b82fb0d1bba0889df939aac5a5b493.tar.gz chromium_src-8435cb9714b82fb0d1bba0889df939aac5a5b493.tar.bz2 | |
Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).
This change will be reverted soon.
BUG=114302
TEST=run all existing tests.
Review URL: https://chromiumcodereview.appspot.com/9666033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/leak_annotations.h | 2 | ||||
| -rw-r--r-- | base/debug/profiler.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h index 1f8b28a..5ebf9d8 100644 --- a/base/debug/leak_annotations.h +++ b/base/debug/leak_annotations.h @@ -10,7 +10,7 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_HEAPCHECKER) -#include "third_party/tcmalloc/chromium/src/google/heap-checker.h" +#include "third_party/tcmalloc/chromium/src/gperftools/heap-checker.h" // Annotate a program scope as having memory leaks. Tcmalloc's heap leak // checker will ignore them. Note that these annotations may mask real bugs diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc index 4195057..e1f2514 100644 --- a/base/debug/profiler.cc +++ b/base/debug/profiler.cc @@ -15,7 +15,7 @@ #endif // defined(OS_WIN) #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC) -#include "third_party/tcmalloc/chromium/src/google/profiler.h" +#include "third_party/tcmalloc/chromium/src/gperftools/profiler.h" #endif namespace base { |