Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/DEPS

Index: components/gcm_driver/DEPS
diff --git a/components/gcm_driver/DEPS b/components/gcm_driver/DEPS
index 274a83906a13d4281ddd9ac5f4c721576a764303..039ab86b73e1dd334259664c39fc7ddf046aa9d9 100644
--- a/components/gcm_driver/DEPS
+++ b/components/gcm_driver/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/crx_file/id_util.h",
   "+components/os_crypt",
   "+components/keyed_service",
   "+components/pref_registry",
@@ -8,8 +9,7 @@ include_rules = [
   "+components/sync_driver",
   "+components/timers",  # Only used for Chrome OS builds.
   "+components/version_info",
-  # TODO(johnme): Fix this layering violation.
-  "!content/public/android/java",
+  "+content/public/android/java",

[Nicolas Zea, 2016/08/17 20:54:09]

My understanding was that components should never depend on content/?

[johnme, 2016/08/18 17:43:21]

components/README says "Individual components may additionally allow
dependencies on the content API and IPC".

components/ code used by iOS can't depend on content/, but this DEPS rule is
Android-only so that's not a problem in this case.

   "+google_apis/gaia",
   "+google_apis/gcm",
   "+jni",