Add support for GCM subtypes to desktop Instance ID implementation

chrome/browser/services/gcm/gcm_profile_service_unittest.cc

Index: chrome/browser/services/gcm/gcm_profile_service_unittest.cc
diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
index 8787bde7d6f944b57d94416e4cf996ccf2d174c5..245c903917c8f624607fad53ec75682eba4b752f 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
@@ -12,11 +12,13 @@
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
+#include "chrome/browser/services/gcm/gcm_product_util.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/channel_info.h"
+#include "chrome/common/chrome_version.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/gcm_profile_service.h"
 #if defined(OS_CHROMEOS)
@@ -53,7 +55,7 @@ std::unique_ptr<KeyedService> BuildGCMProfileService(
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
   return base::WrapUnique(new gcm::GCMProfileService(
       profile->GetPrefs(), profile->GetPath(), profile->GetRequestContext(),
-      chrome::GetChannel(),
+      chrome::GetChannel(), gcm::CategoryForSubtypes(profile->GetPrefs()),
       std::unique_ptr<ProfileIdentityProvider>(new ProfileIdentityProvider(
           SigninManagerFactory::GetForProfile(profile),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),