| Index: base/process/launch_posix.cc
|
| diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
|
| index 0ebf984f5ae150638c93aa2892a26b26ebbf9d23..edae49b19cd36ef684f3c8af8f395d96306acc1c 100644
|
| --- a/base/process/launch_posix.cc
|
| +++ b/base/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,
|
|
|