Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/BUILD.gn

Index: components/gcm_driver/BUILD.gn
diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn
index db359965e80eede3e655b9f86ad0823e13f38181..f178e02ab50493a29e7899403a5eb16fcbf9600d 100644
--- a/components/gcm_driver/BUILD.gn
+++ b/components/gcm_driver/BUILD.gn
@@ -61,6 +61,7 @@ static_library("gcm_driver") {
 
   deps = [
     "//base",
+    "//components/crx_file",
     "//components/gcm_driver/common",
     "//components/gcm_driver/crypto",
     "//components/keyed_service/core",
@@ -100,7 +101,10 @@ static_library("gcm_driver") {
       "gcm_stats_recorder_impl.cc",
       "gcm_stats_recorder_impl.h",
     ]
-    deps -= [ "//google_apis/gcm" ]
+    deps -= [
+      "//components/crx_file",
+      "//google_apis/gcm",
+    ]
     deps += [ "android:jni_headers" ]
   }
 }