Merge 161048 - Disable tcmalloc profile files.

chrome/renderer/chrome_render_process_observer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_render_process_observer.h"
 
 #include "base/allocator/allocator_extension.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 202 matching lines @@
 
 bool ChromeRenderProcessObserver::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderProcessObserver, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsIncognitoProcess,
                         OnSetIsIncognitoProcess)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetCacheCapacities, OnSetCacheCapacities)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_ClearCache, OnClearCache)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
-#if defined(USE_TCMALLOC)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetTcmallocHeapProfiling,
-                        OnSetTcmallocHeapProfiling)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_WriteTcmallocHeapProfile,
-                        OnWriteTcmallocHeapProfile)
-#endif
     IPC_MESSAGE_HANDLER(ChromeViewMsg_GetV8HeapStats, OnGetV8HeapStats)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_GetCacheResourceStats,
                         OnGetCacheResourceStats)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_PurgeMemory, OnPurgeMemory)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingRules,
                         OnSetContentSettingRules)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_ToggleWebKitSharedTimer,
                         OnToggleWebKitSharedTimer)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 27 matching lines @@
     WebCache::clear();
   }
 }
 
 void ChromeRenderProcessObserver::OnGetCacheResourceStats() {
   WebCache::ResourceTypeStats stats;
   WebCache::getResourceTypeStats(&stats);
   RenderThread::Get()->Send(new ChromeViewHostMsg_ResourceTypeStats(stats));
 }
 
-#if defined(USE_TCMALLOC)
-void ChromeRenderProcessObserver::OnSetTcmallocHeapProfiling(
-    bool profiling, const std::string& filename_prefix) {
-#if !defined(OS_WIN)
-  // TODO(stevenjb): Create MallocExtension wrappers for HeapProfile functions.
-  if (profiling)
-    HeapProfilerStart(filename_prefix.c_str());
-  else
-    HeapProfilerStop();
-#endif
-}
-
-void ChromeRenderProcessObserver::OnWriteTcmallocHeapProfile(
-    const FilePath::StringType& filename) {
-#if !defined(OS_WIN)
-  // TODO(stevenjb): Create MallocExtension wrappers for HeapProfile functions.
-  if (!IsHeapProfilerRunning())
-    return;
-  char* profile = GetHeapProfile();
-  if (!profile) {
-    LOG(WARNING) << "Unable to get heap profile.";
-    return;
-  }
-  // The render process can not write to a file, so copy the result into
-  // a string and pass it to the handler (which runs on the browser host).
-  std::string result(profile);
-  delete profile;
-  RenderThread::Get()->Send(
-      new ChromeViewHostMsg_WriteTcmallocHeapProfile_ACK(filename, result));
-#endif
-}
-
-#endif
-
 void ChromeRenderProcessObserver::OnSetFieldTrialGroup(
     const std::string& field_trial_name,
     const std::string& group_name) {
   base::FieldTrialList::CreateFieldTrial(field_trial_name, group_name);
   chrome_variations::SetChildProcessLoggingVariationList();
 }
 
 void ChromeRenderProcessObserver::OnGetV8HeapStats() {
   v8::HeapStatistics heap_stats;
   v8::V8::GetHeapStatistics(&heap_stats);
@@ skipping 36 matching lines @@
   if (clear_cache_pending_) {
     clear_cache_pending_ = false;
     WebCache::clear();
   }
 }
 
 const RendererContentSettingRules*
 ChromeRenderProcessObserver::content_setting_rules() const {
   return &content_setting_rules_;
 }