• David Trainor's avatar
    Revert "Sampling profiler: disable GPU main thread profiling on OS X" · 150adef2
    David Trainor authored
    This reverts commit 43a4f5d0.
    
    Reason for revert: Looks like the changes to thread_profiler broke some Android tests? (ToastHWATest): https://ci.chromium.org/buildbot/chromium.android/Lollipop%20Phone%20Tester/19475
    
    [FATAL:thread_profiler.cc(154)] Check failed: metrics::CallStackProfileParams::BROWSER_PROCESS != GetProcess() (1 vs. 1)
    
    Reverting.  Sorry!
    
    
    Original change's description:
    > Sampling profiler: disable GPU main thread profiling on OS X
    > 
    > Disabling pending a resolution to crashes observed in the associated
    > bug.
    > 
    > This change also removes the unused
    > GetSamplingParamsForCurrentProcess function and adapts
    > IsProfilerEnabledForCurrentProcess to operate on the current process
    > and specified thread.
    > 
    > The call to IsProfilerEnabledForCurrentProcess is also removed
    > from SetServiceManagerConnectorForChildProcess since that function is
    > only invoked in processes supporting the profiler.
    > 
    > Bug: 774682
    > Change-Id: Ibbc6f1bd9348ba09a3ee4db2e1595411617f1ccd
    > Reviewed-on: https://chromium-review.googlesource.com/962937
    > Commit-Queue: Mike Wittman <wittman@chromium.org>
    > Reviewed-by: Scott Violet <sky@chromium.org>
    > Reviewed-by: Leonard Grey <lgrey@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#543520}
    
    TBR=sky@chromium.org,wittman@chromium.org,lgrey@chromium.org
    
    Change-Id: I2ecac49a6e14de7f620dc0096ce229f25057c810
    No-Presubmit: true
    No-Tree-Checks: true
    No-Try: true
    Bug: 774682
    Reviewed-on: https://chromium-review.googlesource.com/965821Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
    Commit-Queue: David Trainor <dtrainor@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#543613}
    150adef2
thread_profiler.cc 12.2 KB