Add browser-global GCMDriver

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 33969aaf631aae482474aa6f8ae5bfbc036b88c9..b8d1bb25dde5b1edaab87e96f907731eaa69231b 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -13,11 +13,13 @@
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/debug/leak_annotations.h"
+#include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/default_tick_clock.h"
@@ -63,6 +65,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#include "chrome/browser/services/gcm/gcm_utils.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -77,6 +80,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "components/gcm_driver/gcm_client_factory.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/translate_download_manager.h"
@@ -90,6 +95,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_l10n_util.h"
+#include "google_apis/gaia/identity_provider.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -125,6 +131,13 @@
 #include "chrome/browser/media/webrtc_log_uploader.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/device_identity_provider.h"
+#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
+#else
+#include "google_apis/gaia/dummy_identity_provider.h"
+#endif
+
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 // How often to check if the persistent instance of Chrome needs to restart
 // to install an update.
@@ -262,6 +275,10 @@ void BrowserProcessImpl::StartTearDown() {
     browser_policy_connector_->Shutdown();
 #endif
 
+  // The |gcm_driver_| must shut down while the IO thread is still alive.
+  if (gcm_driver_)
+    gcm_driver_->Shutdown();
+
   // Stop the watchdog thread before stopping other threads.
   watchdog_thread_.reset();
 
@@ -642,6 +659,13 @@ NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() {
   return network_time_tracker_.get();
 }
 
+gcm::GCMDriver* BrowserProcessImpl::gcm_driver() {
+  DCHECK(CalledOnValidThread());
+  if (!gcm_driver_)
+    CreateGCMDriver();
+  return gcm_driver_.get();
+}
+
 // static
 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
@@ -986,6 +1010,37 @@ void BrowserProcessImpl::CreateSafeBrowsingService() {
 #endif
 }
 
+void BrowserProcessImpl::CreateGCMDriver() {
+  DCHECK(!gcm_driver_);
+
+  base::FilePath store_path;
+  CHECK(PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path));
+
+  scoped_refptr<base::SequencedWorkerPool> worker_pool(
+      content::BrowserThread::GetBlockingPool());
+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
+      worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
+          worker_pool->GetSequenceToken(),
+          base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
+
+  gcm_driver_.reset(new gcm::GCMDriver(

[jianli, 2014/06/02 22:34:40]

You need to sync to pick up johnme's change. I don't think we need to create
GCMDriver global instance for Android.

It seems that the creation logic here is very similar to the one used in
GCMProfileService constructor. Could you please create a helper function to
share the code? Perhaps you could define something like CreateGCMDriver in
gcm_utils.h:
  scoped_ptr<GCMDriver> CreateGCMDriverDesktop(
    scoped_ptr<GCMClientFactory> gcm_client_factory,
    scoped_ptr<IdentityProvider> identity_provider,
    const base::FilePath& store_path,
    const scoped_refptr<net::URLRequestContextGetter>& request_context);

[bartfab (slow), 2014/06/03 13:36:49]

Done. For consistency, I made the code also create a global GCMDriver instance
on Android. I feel that if we add gcm_driver() to the cross-platform
BrowserProcessImpl class, it should return something valid on every platform,
including Android. If nobody ever requests a GCMDriver on Android, none will be
created, so no resources will be wasted needlessly.

+      make_scoped_ptr(new gcm::GCMClientFactory),
+#if defined(OS_CHROMEOS)
+      scoped_ptr<IdentityProvider>(new chromeos::DeviceIdentityProvider(
+          chromeos::DeviceOAuth2TokenServiceFactory::Get())),
+#else
+      scoped_ptr<IdentityProvider>(new DummyIdentityProvider),
+#endif
+      gcm::GetChromeBuildInfo(),
+      store_path,
+      system_request_context(),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::IO),
+      blocking_task_runner));
+}
+
 MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() {
   DCHECK(CalledOnValidThread());
   if (!metrics_services_manager_)