Add support for GCM subtypes to desktop Instance ID implementation

chrome/browser/extensions/api/instance_id/instance_id_api.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 "chrome/browser/extensions/api/instance_id/instance_id_api.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 62 matching lines @@
 }
 
 bool InstanceIDApiFunction::IsEnabled() const {
   Profile* profile = Profile::FromBrowserContext(browser_context());
 
   return instance_id::InstanceIDProfileService::IsInstanceIDEnabled(profile);
 }
 
 instance_id::InstanceID* InstanceIDApiFunction::GetInstanceID() const {
   return instance_id::InstanceIDProfileServiceFactory::GetForProfile(
-      Profile::FromBrowserContext(browser_context()))->driver()->
-          GetInstanceID(extension()->id());
+             Profile::FromBrowserContext(browser_context()))
+      ->driver()
+      ->GetInstanceIDForExtensions(extension()->id());
 }
 
 InstanceIDGetIDFunction::InstanceIDGetIDFunction() {}
 
 InstanceIDGetIDFunction::~InstanceIDGetIDFunction() {}
 
 ExtensionFunction::ResponseAction InstanceIDGetIDFunction::DoWork() {
   GetInstanceID()->GetID(
       base::Bind(&InstanceIDGetIDFunction::GetIDCompleted, this));
   return RespondLater();
@@ skipping 89 matching lines @@
 
 void InstanceIDDeleteIDFunction::DeleteIDCompleted(
     instance_id::InstanceID::Result result) {
   if (result == instance_id::InstanceID::SUCCESS)
     Respond(NoArguments());
   else
     Respond(Error(InstanceIDResultToError(result)));
 }
 
 }  // namespace extensions