summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 13:48:04 +0000
committersgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 13:48:04 +0000
commit1b1f3ebbe0b517478d7647cb26721eb0b2d5c8ea (patch)
treeb657cd0802983a80e07298ec930822b87711c711 /chrome
parentfbe44334084bbf58447b9c3e78e4dee9039c44ce (diff)
downloadchromium_src-1b1f3ebbe0b517478d7647cb26721eb0b2d5c8ea.zip
chromium_src-1b1f3ebbe0b517478d7647cb26721eb0b2d5c8ea.tar.gz
chromium_src-1b1f3ebbe0b517478d7647cb26721eb0b2d5c8ea.tar.bz2
Point #include lines to files in the new tcmalloc/chromium local branch.
Add +third_party\tcmalloc to webkit\DEPS. BUG=27911 TEST=none Review URL: http://codereview.chromium.org/449016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_about_handler.cc2
-rw-r--r--chrome/browser/memory_purger.cc2
-rw-r--r--chrome/renderer/render_thread.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 79abe28..8ae39e0 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -59,7 +59,7 @@
#endif
#if defined(USE_TCMALLOC)
-#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h"
+#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
#endif
using sync_api::SyncManager;
diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc
index bde8cdb..b66f043 100644
--- a/chrome/browser/memory_purger.cc
+++ b/chrome/browser/memory_purger.cc
@@ -19,7 +19,7 @@
#include "chrome/common/render_messages.h"
#include "net/proxy/proxy_resolver.h"
#include "net/url_request/url_request_context.h"
-#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h"
+#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
#include "v8/include/v8.h"
// PurgeMemoryHelper -----------------------------------------------------------
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 3474109..69c8cb2 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -57,7 +57,7 @@
#include "chrome/renderer/user_script_slave.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_platform_file.h"
-#include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h"
+#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
#include "third_party/WebKit/WebKit/chromium/public/WebColor.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h"