| 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 13279e87be8f44220b34bfbb98c6703093355752..73109a99d764b4cd7b9ef92afd871862a0cae54e 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -93,6 +93,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"
|
| @@ -338,6 +339,10 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
|
| if (KioskModeSettings::Get()->IsKioskModeEnabled())
|
| ShutdownKioskModeScreensaver();
|
|
|
| + // Since DBusThreadManager is shutdown via the DBusServices destructor, it is
|
| + // safe to shutdown the PowerDataCollector here.
|
| + PowerDataCollector::Shutdown();
|
| +
|
| // To be precise, logout (browser shutdown) is not yet done, but the
|
| // remaining work is negligible, hence we say LogoutDone here.
|
| BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", false);
|
| @@ -399,6 +404,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
|
|
| dbus_services_.reset(new internal::DBusServices(parameters()));
|
|
|
| + // Initialize power data collector only after DBusThreadManager is initialized
|
| + // in the DBusServices.
|
| + PowerDataCollector::Initialize();
|
| +
|
| ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();
|
| }
|
|
|
|
|