Refactor OAuth2TokenService to have profile- and device-based implementations.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

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 ed6edde12fa4d518f96b6e8ab5fed44d5dadc95e..a95d65fec9a23e4cdefc1315406b86663a85a13f 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/user_activity_notifier.h"
 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
 #include "chrome/browser/chromeos/screensaver/screensaver_controller.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/settings/owner_key_util.h"
 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
@@ -472,6 +473,8 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
     SystemKeyEventListener::Initialize();
   }
 
+  chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
+
   ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
 }
 
@@ -723,6 +726,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   // cause it to crash during shutdown.
   LoginUtils::Get()->StopBackgroundFetchers();
 
+  // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
+  chromeos::DeviceOAuth2TokenServiceFactory::Shutdown();
+
   // Shutdown the upgrade detector for Chrome OS. The upgrade detector
   // stops monitoring changes from the update engine.
   if (UpgradeDetectorChromeos::GetInstance())