Add support for GCM subtypes to desktop Instance ID implementation

ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc

Index: ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc
diff --git a/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc b/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc
index abe148c203262355df0d8991b94d1f0454b14f48..5d98fc4958f00d75a5acf6a33185407681a9cda5 100644
--- a/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc
+++ b/ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc
@@ -32,6 +32,15 @@ IOSChromeGCMProfileServiceFactory::GetInstance() {
   return base::Singleton<IOSChromeGCMProfileServiceFactory>::get();
 }
 
+// static
+std::string IOSChromeGCMProfileServiceFactory::GetProductCategoryForSubtypes() {
+#if defined(GOOGLE_CHROME_BUILD)
+  return "com.chrome.ios";
+#else
+  return "org.chromium.ios";
+#endif
+}
+
 IOSChromeGCMProfileServiceFactory::IOSChromeGCMProfileServiceFactory()
     : BrowserStateKeyedServiceFactory(
           "GCMProfileService",
@@ -57,6 +66,7 @@ IOSChromeGCMProfileServiceFactory::BuildServiceInstanceFor(
   return base::WrapUnique(new gcm::GCMProfileService(
       browser_state->GetPrefs(), browser_state->GetStatePath(),
       browser_state->GetRequestContext(), ::GetChannel(),
+      GetProductCategoryForSubtypes(),
       base::WrapUnique(new ProfileIdentityProvider(
           ios::SigninManagerFactory::GetForBrowserState(browser_state),
           OAuth2TokenServiceFactory::GetForBrowserState(browser_state),