Add support for GCM subtypes to desktop Instance ID implementation

chrome/browser/extensions/extension_gcm_app_handler.cc

 // Copyright 2014 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/extension_gcm_app_handler.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 123 matching lines @@
     RemoveAppHandler(extension->id());
 }
 
 void ExtensionGCMAppHandler::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
     const Extension* extension,
     extensions::UninstallReason reason) {
   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()));
   }
 }
 
 void ExtensionGCMAppHandler::AddDummyAppHandler() {
   AddAppHandler(kDummyAppId);
 }
 
 void ExtensionGCMAppHandler::RemoveDummyAppHandler() {
   RemoveAppHandler(kDummyAppId);
 }
@@ skipping 35 matching lines @@
 
 void ExtensionGCMAppHandler::AddAppHandler(const std::string& app_id) {
   GetGCMDriver()->AddAppHandler(app_id, this);
 }
 
 void ExtensionGCMAppHandler::RemoveAppHandler(const std::string& app_id) {
   GetGCMDriver()->RemoveAppHandler(app_id);
 }
 
 }  // namespace extensions