| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 14ab8a445ab68d5a3eafce59e2fb76cd26a216a8..40607736e453d9832cf85cc01f8ece3c8766f131 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -65,7 +65,6 @@
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/notifications/desktop_notification_service_factory.h"
|
| #include "chrome/browser/performance_monitor/performance_monitor.h"
|
| -#include "chrome/browser/performance_monitor/startup_timer.h"
|
| #include "chrome/browser/plugins/plugin_prefs.h"
|
| #include "chrome/browser/power/process_power_collector.h"
|
| #include "chrome/browser/pref_service_flags_storage.h"
|
| @@ -543,7 +542,6 @@ ChromeBrowserMainParts::ChromeBrowserMainParts(
|
| result_code_(content::RESULT_CODE_NORMAL_EXIT),
|
| startup_watcher_(new StartupTimeBomb()),
|
| shutdown_watcher_(new ShutdownWatcherHelper()),
|
| - startup_timer_(new performance_monitor::StartupTimer()),
|
| browser_field_trials_(parameters.command_line),
|
| profile_(NULL),
|
| run_message_loop_(true),
|
| @@ -1551,8 +1549,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| browser_creator_.reset();
|
| #endif // !defined(OS_ANDROID)
|
|
|
| - performance_monitor::PerformanceMonitor::GetInstance()->Initialize();
|
| -
|
| #if !defined(OS_ANDROID)
|
| process_power_collector_.reset(new ProcessPowerCollector);
|
| process_power_collector_->Initialize();
|
| @@ -1561,10 +1557,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| PostBrowserStart();
|
|
|
| if (parameters().ui_task) {
|
| - // We end the startup timer here if we have parameters to run, because we
|
| - // never start to run the main loop (where we normally stop the timer).
|
| - startup_timer_->SignalStartupComplete(
|
| - performance_monitor::StartupTimer::STARTUP_TEST);
|
| parameters().ui_task->Run();
|
| delete parameters().ui_task;
|
| run_message_loop_ = false;
|
| @@ -1597,8 +1589,6 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
|
| // UI thread message loop as possible to get a stable measurement
|
| // across versions.
|
| RecordBrowserStartupTime();
|
| - startup_timer_->SignalStartupComplete(
|
| - performance_monitor::StartupTimer::STARTUP_NORMAL);
|
|
|
| DCHECK(base::MessageLoopForUI::IsCurrent());
|
| base::RunLoop run_loop;
|
|
|