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

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 96 matching lines @@
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
+#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "apps/app_shim/app_shim_host_manager_mac.h"
 #endif
 
@@ skipping 140 matching lines @@
 
 #if defined(USE_AURA)
   // Delete aura after the metrics service has been deleted as it accesses
   // monitor information.
   aura::Env::DeleteInstance();
 #endif
 
 #if defined(OS_MACOSX)
   app_shim_host_manager_.reset();
 #endif
+
+#if defined(OS_CHROMEOS)
+  // Terminate any in-flight token requests before the IO thread shuts down.
+  device_oauth2_token_service_.reset();
+#endif
 }
 
 void BrowserProcessImpl::PostDestroyThreads() {
   // With the file_thread_ flushed, we can release any icon resources.
   icon_manager_.reset();
 
   // Reset associated state right after actual thread is stopped,
   // as io_thread_.global_ cleanup happens in CleanUp on the IO
   // thread, i.e. as the thread exits its message loop.
   //
@@ skipping 162 matching lines @@
   return variations_service_.get();
 }
 
 #if defined(OS_CHROMEOS)
 chromeos::OomPriorityManager* BrowserProcessImpl::oom_priority_manager() {
   DCHECK(CalledOnValidThread());
   if (!oom_priority_manager_.get())
     oom_priority_manager_.reset(new chromeos::OomPriorityManager());
   return oom_priority_manager_.get();
 }
+
+chromeos::DeviceOAuth2TokenService*
+    BrowserProcessImpl::device_oauth2_token_service() {
+  DCHECK(CalledOnValidThread());
+  if (!device_oauth2_token_service_.get()) {
+    device_oauth2_token_service_.reset(
+        new chromeos::DeviceOAuth2TokenService(system_request_context(),
+                                               local_state()));
+  }
+  return device_oauth2_token_service_.get();
+}
 #endif  // defined(OS_CHROMEOS)
 
 extensions::EventRouterForwarder*
 BrowserProcessImpl::extension_event_router_forwarder() {
   return extension_event_router_forwarder_.get();
 }
 
 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_notification_ui_manager_)
@@ skipping 580 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)