| 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 490b417e70ad11c5082384f5fa05752402d3c966..19af19911c453f3954a8e1d0bd5ebc340c992de9 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -65,6 +65,7 @@
|
| #include "chrome/browser/chromeos/power/power_prefs.h"
|
| #include "chrome/browser/chromeos/power/renderer_freezer.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| +#include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
|
| #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
|
| #include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| #include "chrome/browser/chromeos/status/data_promo_notification.h"
|
| @@ -386,6 +387,10 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
|
|
| wake_on_wifi_manager_.reset(new WakeOnWifiManager());
|
|
|
| + // We must start observing the MetricsService before it is started/stopped in
|
| + // ChromeBrowserMainPartsLinux::PreMainMessageLoopRun() below;
|
| + chromeos::ResourceReporter::StartObservingMetricsService();
|
| +
|
| ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
|
| }
|
|
|
| @@ -697,6 +702,8 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
|
|
|
| // Shut down services before the browser process, etc are destroyed.
|
| void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| + chromeos::ResourceReporter::StopObservingMetricsService();
|
| +
|
| BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
|
|
|
| // Destroy the application name notifier for Kiosk mode.
|
|
|