| Index: content/renderer/devtools/devtools_agent.cc
|
| diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
|
| index 575c035e2b8b66e5fa37332ee84b1a6151225734..f5b629cbe9d60b0072b8654f92f5b4c2e9392b70 100644
|
| --- a/content/renderer/devtools/devtools_agent.cc
|
| +++ b/content/renderer/devtools/devtools_agent.cc
|
| @@ -129,7 +129,7 @@ void DevToolsAgent::clearBrowserCookies() {
|
| Send(new DevToolsHostMsg_ClearBrowserCookies(routing_id()));
|
| }
|
|
|
| -#if defined(USE_TCMALLOC) && !defined(OS_WIN)
|
| +#if defined(USE_TCMALLOC) && !defined(OS_WIN) && !defined(USE_SYSTEM_TCMALLOC)
|
| static void AllocationVisitor(void* data, const void* ptr) {
|
| typedef WebKit::WebDevToolsAgentClient::AllocatedObjectVisitor Visitor;
|
| Visitor* visitor = reinterpret_cast<Visitor*>(data);
|
| @@ -138,7 +138,7 @@ static void AllocationVisitor(void* data, const void* ptr) {
|
| #endif
|
|
|
| void DevToolsAgent::visitAllocatedObjects(AllocatedObjectVisitor* visitor) {
|
| -#if defined(USE_TCMALLOC) && !defined(OS_WIN)
|
| +#if defined(USE_TCMALLOC) && !defined(OS_WIN) && !defined(USE_SYSTEM_TCMALLOC)
|
| IterateAllocatedObjects(&AllocationVisitor, visitor);
|
| #endif
|
| }
|
|
|