summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main.cc
diff options
context:
space:
mode:
authorwittman <wittman@chromium.org>2015-04-21 13:59:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-21 21:00:23 +0000
commit3546792164881c760ce9c36ed6a3da0a61dfaf0c (patch)
tree6ed0c3092eb4641f57df00f56d41e0be4dcf246a /chrome/browser/chrome_browser_main.cc
parent223ff659bb66d1970443197eb71e84c367fb3da1 (diff)
downloadchromium_src-3546792164881c760ce9c36ed6a3da0a61dfaf0c.zip
chromium_src-3546792164881c760ce9c36ed6a3da0a61dfaf0c.tar.gz
chromium_src-3546792164881c760ce9c36ed6a3da0a61dfaf0c.tar.bz2
Disable startup stack profiling
This has provided enough data for now to enable work and validation of server-side processing. This change also resolves a crash with anti-virus libraries' hooks not honoring the x64 stack unwinding conventions. This issue will need to be addressed prior to re-enabling this functionality. BUG=464929, 476422 Review URL: https://codereview.chromium.org/1094183002 Cr-Commit-Position: refs/heads/master@{#326114}
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
-rw-r--r--chrome/browser/chrome_browser_main.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index a76aad9..a8c1b1f 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -553,18 +553,6 @@ class LoadCompleteListener : public content::NotificationObserver {
DISALLOW_COPY_AND_ASSIGN(LoadCompleteListener);
};
-base::StackSamplingProfiler::SamplingParams GetStartupSamplingParams() {
- // Sample at 10Hz for 30 seconds.
- base::StackSamplingProfiler::SamplingParams params;
- params.initial_delay = base::TimeDelta::FromMilliseconds(0);
- params.bursts = 1;
- params.samples_per_burst = 300;
- params.sampling_interval = base::TimeDelta::FromMilliseconds(100);
- params.preserve_sample_ordering = false;
- params.user_data = metrics::CallStackProfileMetricsProvider::PROCESS_STARTUP;
- return params;
-}
-
} // namespace
namespace chrome_browser {
@@ -593,14 +581,11 @@ ChromeBrowserMainParts::ChromeBrowserMainParts(
startup_watcher_(new StartupTimeBomb()),
shutdown_watcher_(new ShutdownWatcherHelper()),
browser_field_trials_(parameters.command_line),
- sampling_profiler_(base::PlatformThread::CurrentId(),
- GetStartupSamplingParams()),
profile_(NULL),
run_message_loop_(true),
notify_result_(ProcessSingleton::PROCESS_NONE),
local_state_(NULL),
restart_last_session_(false) {
- sampling_profiler_.Start();
// If we're running tests (ui_task is non-null).
if (parameters.ui_task)
browser_defaults::enable_help_app = false;