Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_profile_service.cc

 // Copyright (c) 2013 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 "components/gcm_driver/gcm_profile_service.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 123 matching lines @@
     scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) {
   driver_.reset(new GCMDriverAndroid(path.Append(gcm_driver::kGCMStoreDirname),
                                      blocking_task_runner));
 }
 #else
 GCMProfileService::GCMProfileService(
     PrefService* prefs,
     base::FilePath path,
     net::URLRequestContextGetter* request_context,
     version_info::Channel channel,
+    const std::string& product_category_for_subtypes,
     std::unique_ptr<ProfileIdentityProvider> identity_provider,
     std::unique_ptr<GCMClientFactory> gcm_client_factory,
     const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
     scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner)
     : profile_identity_provider_(std::move(identity_provider)),
       request_context_(request_context) {
-  driver_ = CreateGCMDriverDesktop(std::move(gcm_client_factory), prefs,
-                                   path.Append(gcm_driver::kGCMStoreDirname),
-                                   request_context_, channel, ui_task_runner,
-                                   io_task_runner, blocking_task_runner);
+  driver_ = CreateGCMDriverDesktop(
+      std::move(gcm_client_factory), prefs,
+      path.Append(gcm_driver::kGCMStoreDirname), request_context_, channel,
+      product_category_for_subtypes, ui_task_runner, io_task_runner,
+      blocking_task_runner);
 
   identity_observer_.reset(new IdentityObserver(
       profile_identity_provider_.get(), request_context_, driver_.get()));
 }
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService() {}
 
 GCMProfileService::~GCMProfileService() {}
 
@@ skipping 11 matching lines @@
   driver_.reset(driver);
 #if !defined(OS_ANDROID)
   if (identity_observer_) {
     identity_observer_.reset(new IdentityObserver(
         profile_identity_provider_.get(), request_context_, driver));
   }
 #endif  // !defined(OS_ANDROID)
 }
 
 }  // namespace gcm