Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/instance_id/instance_id_android.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_android.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 27 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_setBlockOnAsyncTasksForTesting(env, previous_value_);
 }
 
 // static
 bool InstanceIDAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
-std::unique_ptr<InstanceID> InstanceID::Create(const std::string& app_id,
-                                               gcm::GCMDriver* gcm_driver) {
+std::unique_ptr<InstanceID> InstanceID::CreateInternal(
+    const std::string& app_id,
+    bool use_subtype,
+    gcm::GCMDriver* gcm_driver) {
+  CHECK(use_subtype) << "Android only supports InstanceIDs using subtypes";
   return base::WrapUnique(new InstanceIDAndroid(app_id, gcm_driver));
 }
 
 InstanceIDAndroid::InstanceIDAndroid(const std::string& app_id,
                                      gcm::GCMDriver* gcm_driver)
     : InstanceID(app_id, gcm_driver) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DCHECK(!app_id.empty()) << "Empty app_id is not supported";
   // The |app_id| is stored in GCM's category field by the desktop InstanceID
@@ skipping 152 matching lines @@
     jboolean success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DeleteIDCallback* callback = delete_id_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->Run(success ? InstanceID::SUCCESS : InstanceID::UNKNOWN_ERROR);
   delete_id_callbacks_.Remove(request_id);
 }
 
 }  // namespace instance_id