Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/instance_id/instance_id_driver.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 "components/gcm_driver/instance_id/instance_id_driver.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "components/gcm_driver/gcm_driver.h"
@@ skipping 15 matching lines @@
 }
 
 InstanceIDDriver::InstanceIDDriver(gcm::GCMDriver* gcm_driver)
     : gcm_driver_(gcm_driver) {
 }
 
 InstanceIDDriver::~InstanceIDDriver() {
 }
 
 InstanceID* InstanceIDDriver::GetInstanceID(const std::string& app_id) {
+  return GetInstanceID(app_id, true /* use_subtype */);
+}
+
+InstanceID* InstanceIDDriver::GetInstanceIDForExtensions(
+    const std::string& app_id) {
+  return GetInstanceID(app_id, false /* use_subtype */);
+}
+
+InstanceID* InstanceIDDriver::GetInstanceID(const std::string& app_id,
+                                            bool use_subtype) {
   auto iter = instance_id_map_.find(app_id);
   if (iter != instance_id_map_.end())
     return iter->second.get();
 
   std::unique_ptr<InstanceID> instance_id =
-      InstanceID::Create(app_id, gcm_driver_);
+      InstanceID::CreateInternal(app_id, use_subtype, gcm_driver_);
   InstanceID* instance_id_ptr = instance_id.get();
   instance_id_map_.insert(std::make_pair(app_id, std::move(instance_id)));
   return instance_id_ptr;
 }
 
 void InstanceIDDriver::RemoveInstanceID(const std::string& app_id) {
   instance_id_map_.erase(app_id);
 }
 
 bool InstanceIDDriver::ExistsInstanceID(const std::string& app_id) const {
   return instance_id_map_.find(app_id) != instance_id_map_.end();
 }
 
 }  // namespace instance_id