| Index: process/launch_posix.cc | 
| diff --git a/process/launch_posix.cc b/process/launch_posix.cc | 
| index 96685cb15dd93b2733e67e1b5322d9a39f0ad8f3..6c2f77911ca79940b910c26956c115ffa5bee187 100644 | 
| --- a/process/launch_posix.cc | 
| +++ b/process/launch_posix.cc | 
| @@ -22,7 +22,6 @@ | 
| #include <limits> | 
| #include <set> | 
|  | 
| -#include "base/allocator/type_profiler_control.h" | 
| #include "base/command_line.h" | 
| #include "base/compiler_specific.h" | 
| #include "base/debug/debugger.h" | 
| @@ -392,11 +391,6 @@ Process LaunchProcess(const std::vector<std::string>& argv, | 
| } | 
| } | 
|  | 
| -    // Stop type-profiler. | 
| -    // The profiler should be stopped between fork and exec since it inserts | 
| -    // locks at new/delete expressions.  See http://crbug.com/36678. | 
| -    base::type_profiler::Controller::Stop(); | 
| - | 
| if (options.maximize_rlimits) { | 
| // Some resource limits need to be maximal in this child. | 
| for (size_t i = 0; i < options.maximize_rlimits->size(); ++i) { | 
| @@ -593,11 +587,6 @@ static GetAppOutputInternalResult GetAppOutputInternal( | 
| if (dev_null < 0) | 
| _exit(127); | 
|  | 
| -        // Stop type-profiler. | 
| -        // The profiler should be stopped between fork and exec since it inserts | 
| -        // locks at new/delete expressions.  See http://crbug.com/36678. | 
| -        base::type_profiler::Controller::Stop(); | 
| - | 
| fd_shuffle1.push_back(InjectionArc(pipe_fd[1], STDOUT_FILENO, true)); | 
| fd_shuffle1.push_back(InjectionArc( | 
| include_stderr ? pipe_fd[1] : dev_null, STDERR_FILENO, true)); | 
|  |