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 30a30ac261c84d3329ab7103d3f0717b8bcb3bed..fd5c92dd2797fe2709c6da5a7ffae67bf31a4c04 100644
--- a/components/gcm_driver/BUILD.gn
+++ b/components/gcm_driver/BUILD.gn
@@ -53,6 +53,8 @@ static_library("gcm_driver") {
     "gcm_stats_recorder_android.h",
     "gcm_stats_recorder_impl.cc",
     "gcm_stats_recorder_impl.h",
+    "pref_names.cc",
+    "pref_names.h",
     "registration_info.cc",
     "registration_info.h",
     "system_encryptor.cc",
@@ -74,6 +76,7 @@ static_library("gcm_driver") {
     "//google_apis/gcm",
     "//net",
     "//sync/protocol",
+    "//third_party/re2",

[Peter Beverloo, 2016/07/22 12:17:03]

drop

[johnme, 2016/07/26 17:11:55]

Oops done.

     "//url:url",
   ]
   allow_circular_includes_from = [ "//components/gcm_driver/crypto" ]
@@ -100,6 +103,8 @@ static_library("gcm_driver") {
       "gcm_driver_desktop.h",
       "gcm_stats_recorder_impl.cc",
       "gcm_stats_recorder_impl.h",
+      "pref_names.cc",
+      "pref_names.h",
     ]
     deps -= [ "//google_apis/gcm" ]
     deps += [ "android:jni_headers" ]