Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/instance_id/instance_id.h

Index: components/gcm_driver/instance_id/instance_id.h
diff --git a/components/gcm_driver/instance_id/instance_id.h b/components/gcm_driver/instance_id/instance_id.h
index 85536a414008b8d61d94d70d2c5f27a2ec3c14e2..f7fcab9b2c2e2334878403adb76142bb408cdc06 100644
--- a/components/gcm_driver/instance_id/instance_id.h
+++ b/components/gcm_driver/instance_id/instance_id.h
@@ -60,12 +60,16 @@ class InstanceID {
 
   static const int kInstanceIDByteLength = 8;
 
-  // Creator.
+  // Creator. Should only be used by InstanceIDDriver::GetInstanceID.
   // |app_id|: identifies the application that uses the Instance ID.
+  // |use_subtype|: whether to register |app_id| as a "subtype" of a package
+  //                name auto-generated based on Chrome's app name & channel.
+  //                Must be true on Android.
   // |handler|: provides the GCM functionality needed to support Instance ID.
   //            Must outlive this class. On Android, this can be null instead.
-  static std::unique_ptr<InstanceID> Create(const std::string& app_id,
-                                            gcm::GCMDriver* gcm_driver);
+  static std::unique_ptr<InstanceID> CreateInternal(const std::string& app_id,
+                                                    bool use_subtype,
+                                                    gcm::GCMDriver* gcm_driver);
 
   virtual ~InstanceID();