Add support for GCM subtypes to desktop Instance ID implementation

chrome/browser/extensions/extension_gcm_app_handler.cc

Index: chrome/browser/extensions/extension_gcm_app_handler.cc
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc
index 4a7cc24bff70f0866dce8d85c4af45cb6455435b..f1de7a940580347aa7eb1f8b885c05ea9f7b8fa3 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -141,10 +141,10 @@ void ExtensionGCMAppHandler::OnExtensionUninstalled(
   if (IsGCMPermissionEnabled(extension)) {
     // Let's first remove InstanceID data. GCM unregistration will be triggered
     // after the asynchronous call is returned in OnDeleteIDCompleted.
-    GetInstanceIDDriver()->GetInstanceID(extension->id())->DeleteID(
-        base::Bind(&ExtensionGCMAppHandler::OnDeleteIDCompleted,
-                   weak_factory_.GetWeakPtr(),
-                   extension->id()));
+    GetInstanceIDDriver()
+        ->GetInstanceIDForExtensions(extension->id())
+        ->DeleteID(base::Bind(&ExtensionGCMAppHandler::OnDeleteIDCompleted,
+                              weak_factory_.GetWeakPtr(), extension->id()));
   }
 }