Move IdentityProvider usage from GCMDriverDesktop to GCMProfileService

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 809009cd6bfb54888b0def7610349de411bffa23..66104ed43e2ea32444ae488a87d298d8f4e1197e 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -128,13 +128,6 @@
 #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"
-#elif !defined(OS_ANDROID)
-#include "google_apis/gaia/dummy_identity_provider.h"
-#endif
-
 #if defined(OS_ANDROID)
 #include "components/gcm_driver/gcm_driver_android.h"
 #else
@@ -1031,14 +1024,10 @@ void BrowserProcessImpl::CreateGCMDriver() {
   CHECK(PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path));
   gcm_driver_ = gcm::CreateGCMDriverDesktop(
       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  // defined(OS_CHROMEOS)
       store_path,
       system_request_context());
+  // TODO(jianli): to be removed when sign-in enforcement is dropped.

[bartfab (slow), 2014/06/13 11:27:21]

Nit: s/to/To/

[jianli, 2014/06/13 18:04:48]

Done.

+  gcm_driver_->SignIn();
 #endif  // defined(OS_ANDROID)
 }