| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 3bd64c83ecbbefe39fc82fdd2b3eb4964968adf4..618af72aa3837bcb4afd990e4140864dd76da6bb 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -92,6 +92,7 @@
|
| #include "chromeos/network/network_change_notifier_chromeos.h"
|
| #include "chromeos/network/network_change_notifier_factory_chromeos.h"
|
| #include "chromeos/network/network_handler.h"
|
| +#include "chromeos/power/power_data_collector.h"
|
| #include "chromeos/system/statistics_provider.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -260,6 +261,9 @@ class DBusServices {
|
| DBusThreadManager::Initialize();
|
| CrosDBusService::Initialize();
|
|
|
| + // Initialize PowerDataCollector after DBusThreadManager is initialized.
|
| + PowerDataCollector::Initialize();
|
| +
|
| LoginState::Initialize();
|
| SystemSaltGetter::Initialize();
|
| CertLoader::Initialize();
|
| @@ -313,6 +317,9 @@ class DBusServices {
|
|
|
| CrosDBusService::Shutdown();
|
|
|
| + // Shutdown the PowerDataCollector before shutting down DBusThreadManager.
|
| + PowerDataCollector::Shutdown();
|
| +
|
| // NOTE: This must only be called if Initialize() was called.
|
| DBusThreadManager::Shutdown();
|
| }
|
|
|