diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 00:17:37 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 00:17:37 +0000 |
| commit | ed59063c6b2e7aa113bbc19cc0cac6422799af57 (patch) | |
| tree | 840cfc698d0c1287ef8802ca9a564ae7abdd0f13 /chrome/browser/browser_main.cc | |
| parent | 5315ff7cbd860ed56ebc768f19792e0e41dfb05a (diff) | |
| download | chromium_src-ed59063c6b2e7aa113bbc19cc0cac6422799af57.zip chromium_src-ed59063c6b2e7aa113bbc19cc0cac6422799af57.tar.gz chromium_src-ed59063c6b2e7aa113bbc19cc0cac6422799af57.tar.bz2 | |
Revert 76468 - Added back thread watcher changes.
BUG=71378,73915,73844,73975
TEST=performance tests
Review URL: http://codereview.chromium.org/6588039
TBR=rtenneti@chromium.org
Review URL: http://codereview.chromium.org/6597088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 3e481a2..1622bfa 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -44,7 +44,6 @@ #include "chrome/browser/metrics/histogram_synchronizer.h" #include "chrome/browser/metrics/metrics_log.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/metrics/thread_watcher.h" #include "chrome/browser/net/blob_url_request_job_factory.h" #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" @@ -626,9 +625,6 @@ void CreateChildThreads(BrowserProcessImpl* process) { process->process_launcher_thread(); process->cache_thread(); process->io_thread(); - // Create watchdog thread after creating all other threads because it will - // watch the other threads and they must be running. - process->watchdog_thread(); } // Returns the new local state object, guaranteed non-NULL. @@ -1280,11 +1276,6 @@ int BrowserMain(const MainFunctionParams& parameters) { scoped_refptr<HistogramSynchronizer> histogram_synchronizer( new HistogramSynchronizer()); - // Initialize thread watcher system. This is a singleton and is used by - // WatchDogThread to keep track of information about threads that are being - // watched. - scoped_ptr<ThreadWatcherList> thread_watcher_list(new ThreadWatcherList()); - // Initialize the prefs of the local state. browser::RegisterLocalState(local_state); @@ -1318,9 +1309,6 @@ int BrowserMain(const MainFunctionParams& parameters) { CreateChildThreads(browser_process.get()); - // Start watching all browser threads for responsiveness. - ThreadWatcherList::StartWatchingAll(); - #if defined(OS_CHROMEOS) // Now that the file thread exists we can record our stats. chromeos::BootTimesLoader::Get()->RecordChromeMainStats(); @@ -1838,9 +1826,6 @@ int BrowserMain(const MainFunctionParams& parameters) { process_singleton.Cleanup(); - // Stop all tasks that might run on WatchDogThread. - ThreadWatcherList::StopWatchingAll(); - metrics->Stop(); // browser_shutdown takes care of deleting browser_process, so we need to |