Index: chrome/browser/services/gcm/gcm_profile_service_factory.cc |
diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.cc b/chrome/browser/services/gcm/gcm_profile_service_factory.cc |
index 2cd5bd723ca605c4259b7ff90987b56b42139ce1..92c01d35b6feba7cd87332ce608b57f70a15fa7d 100644 |
--- a/chrome/browser/services/gcm/gcm_profile_service_factory.cc |
+++ b/chrome/browser/services/gcm/gcm_profile_service_factory.cc |
@@ -10,11 +10,11 @@ |
#include "chrome/browser/services/gcm/gcm_profile_service.h" |
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
#include "chrome/browser/signin/signin_manager_factory.h" |
-#include "components/gcm_driver/gcm_client_factory.h" |
#include "components/keyed_service/content/browser_context_dependency_manager.h" |
#if !defined(OS_ANDROID) |
#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
+#include "components/gcm_driver/gcm_client_factory.h" |
#endif |
namespace gcm { |
@@ -50,9 +50,13 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() { |
KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( |
content::BrowserContext* context) const { |
+#if defined(OS_ANDROID) |
+ return new GCMProfileService(Profile::FromBrowserContext(context)); |
+#else |
return new GCMProfileService( |
Profile::FromBrowserContext(context), |
scoped_ptr<GCMClientFactory>(new GCMClientFactory)); |
+#endif |
} |
content::BrowserContext* GCMProfileServiceFactory::GetBrowserContextToUse( |