Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/BUILD.gn

 # 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.
 
 # GYP version: components/gcm_driver.gypi:gcm_driver
 static_library("gcm_driver") {
   sources = [
     "android/component_jni_registrar.cc",
     "android/component_jni_registrar.h",
     "default_gcm_app_handler.cc",
@@ skipping 35 matching lines @@
     "gcm_internals_constants.cc",
     "gcm_internals_constants.h",
     "gcm_internals_helper.cc",
     "gcm_internals_helper.h",
     "gcm_profile_service.cc",
     "gcm_profile_service.h",
     "gcm_stats_recorder_android.cc",
     "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",
     "system_encryptor.h",
   ]
 
   deps = [
     "//base",
     "//components/gcm_driver/common",
     "//components/gcm_driver/crypto",
     "//components/keyed_service/core",
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/prefs",
     "//components/signin/core/browser",
     "//components/sync_driver",
     "//components/version_info",
     "//google_apis",
     "//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" ]
 
   if (is_chromeos) {
     deps += [ "//components/timers" ]
   }
 
   if (is_android) {
     sources -= [
       "gcm_account_mapper.cc",
       "gcm_account_mapper.h",
       "gcm_channel_status_request.cc",
       "gcm_channel_status_request.h",
       "gcm_channel_status_syncer.cc",
       "gcm_channel_status_syncer.h",
       "gcm_client_factory.cc",
       "gcm_client_factory.h",
       "gcm_client_impl.cc",
       "gcm_client_impl.h",
       "gcm_desktop_utils.cc",
       "gcm_desktop_utils.h",
       "gcm_driver_desktop.cc",
       "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" ]
   }
 }
 
 # GYP version: components/gcm_driver.gypi:gcm_driver_test_support
 static_library("test_support") {
   testonly = true
   sources = [
@@ skipping 60 matching lines @@
   if (is_android) {
     sources -= [
       "gcm_account_mapper_unittest.cc",
       "gcm_channel_status_request_unittest.cc",
       "gcm_client_impl_unittest.cc",
       "gcm_driver_desktop_unittest.cc",
       "gcm_stats_recorder_impl_unittest.cc",
     ]
   }
 }