Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_desktop_utils.cc

Index: components/gcm_driver/gcm_desktop_utils.cc
diff --git a/components/gcm_driver/gcm_desktop_utils.cc b/components/gcm_driver/gcm_desktop_utils.cc
index 332ad32a6676ca9b0ff5133821723d25b65167f3..9a2909b57918e061aa5c1ce54284e598f585dd2d 100644
--- a/components/gcm_driver/gcm_desktop_utils.cc
+++ b/components/gcm_driver/gcm_desktop_utils.cc
@@ -63,11 +63,14 @@ std::string GetVersion() {
   return version_info::GetVersionNumber();
 }
 
-GCMClient::ChromeBuildInfo GetChromeBuildInfo(version_info::Channel channel) {
+GCMClient::ChromeBuildInfo GetChromeBuildInfo(
+    version_info::Channel channel,
+    const std::string& category_for_subtypes) {
   GCMClient::ChromeBuildInfo chrome_build_info;
   chrome_build_info.platform = GetPlatform();
   chrome_build_info.channel = GetChannel(channel);
   chrome_build_info.version = GetVersion();
+  chrome_build_info.category_for_subtypes = category_for_subtypes;
   return chrome_build_info;
 }
 
@@ -92,11 +95,13 @@ std::unique_ptr<GCMDriver> CreateGCMDriverDesktop(
     const base::FilePath& store_path,
     const scoped_refptr<net::URLRequestContextGetter>& request_context,
     version_info::Channel channel,
+    const std::string& category_for_subtypes,
     const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) {
   return std::unique_ptr<GCMDriver>(new GCMDriverDesktop(
-      std::move(gcm_client_factory), GetChromeBuildInfo(channel),
+      std::move(gcm_client_factory),
+      GetChromeBuildInfo(channel, category_for_subtypes),
       GetChannelStatusRequestUrl(channel), GetUserAgent(channel), prefs,
       store_path, request_context, ui_task_runner, io_task_runner,
       blocking_task_runner));