Make Web Push use InstanceID tokens instead of GCM registrations

chrome/browser/push_messaging/push_messaging_service_factory.cc

 // Copyright 2015 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/push_messaging/push_messaging_service_factory.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"
+#include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 // static
 PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile(
-    content::BrowserContext* profile) {
+    content::BrowserContext* context) {
   // The Push API is not currently supported in incognito mode.
   // See https://crbug.com/401439.
-  if (profile->IsOffTheRecord())
-    return NULL;
+  if (context->IsOffTheRecord())
+    return nullptr;
+
+  if (!instance_id::InstanceIDProfileService::IsInstanceIDEnabled(
+          Profile::FromBrowserContext(context))) {
+    return nullptr;

[Peter Beverloo, 2016/04/11 15:47:56]

+LOG(WARNING)?

[johnme, 2016/04/21 10:58:37]

Added a DLOG(WARNING).

+  }
 
   return static_cast<PushMessagingServiceImpl*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
+      GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
 PushMessagingServiceFactory* PushMessagingServiceFactory::GetInstance() {
   return base::Singleton<PushMessagingServiceFactory>::get();
 }
 
 PushMessagingServiceFactory::PushMessagingServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "PushMessagingProfileService",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());

[Peter Beverloo, 2016/04/11 15:47:56]

We still use the GCMProfileServiceFactory in the ServiceImpl.

[johnme, 2016/04/21 10:58:37]

Good point. Readded (I guess it was working only because IID happens to depend
on GCM).

+  DependsOn(instance_id::InstanceIDProfileServiceFactory::GetInstance());
   DependsOn(HostContentSettingsMapFactory::GetInstance());
   DependsOn(PermissionManagerFactory::GetInstance());
 }
 
 PushMessagingServiceFactory::~PushMessagingServiceFactory() {}
 
 void PushMessagingServiceFactory::RestoreFactoryForTests(
     content::BrowserContext* context) {
   SetTestingFactory(context, [](content::BrowserContext* context) {
     return scoped_ptr<KeyedService>(
         GetInstance()->BuildServiceInstanceFor(context));
   });
 }
 
 KeyedService* PushMessagingServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
   CHECK(!profile->IsOffTheRecord());
   return new PushMessagingServiceImpl(profile);
 }
 
 content::BrowserContext* PushMessagingServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }