summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 10:07:19 +0000
committerdmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 10:07:19 +0000
commitab100318a067963f3dcadd2d4343a60f5c1526ca (patch)
tree513594a03877d9f72e91f68564ac4ec9aee01328 /webkit
parent481fd5c06b22904869d3d306430958cbf3575438 (diff)
downloadchromium_src-ab100318a067963f3dcadd2d4343a60f5c1526ca.zip
chromium_src-ab100318a067963f3dcadd2d4343a60f5c1526ca.tar.gz
chromium_src-ab100318a067963f3dcadd2d4343a60f5c1526ca.tar.bz2
Revert 126020 - 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 TBR=dmikurube@chromium.org Review URL: https://chromiumcodereview.appspot.com/9667026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/extensions/v8/heap_profiler_extension.cc2
-rw-r--r--webkit/extensions/v8/profiler_extension.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/extensions/v8/heap_profiler_extension.cc b/webkit/extensions/v8/heap_profiler_extension.cc
index 17f9110..4f36df6 100644
--- a/webkit/extensions/v8/heap_profiler_extension.cc
+++ b/webkit/extensions/v8/heap_profiler_extension.cc
@@ -8,7 +8,7 @@
#include "v8/include/v8.h"
#if defined(USE_TCMALLOC) && !defined(OS_WIN)
-#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
+#include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"
#endif
namespace extensions_v8 {
diff --git a/webkit/extensions/v8/profiler_extension.cc b/webkit/extensions/v8/profiler_extension.cc
index 3ffc205..18ff280 100644
--- a/webkit/extensions/v8/profiler_extension.cc
+++ b/webkit/extensions/v8/profiler_extension.cc
@@ -8,7 +8,7 @@
#include "v8/include/v8.h"
#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "third_party/tcmalloc/chromium/src/gperftools/profiler.h"
+#include "third_party/tcmalloc/chromium/src/google/profiler.h"
#endif
const char kProfilerExtensionName[] = "v8/Profiler";