Merging chrome/common/gcm_desktop_util.* and chrome/browser/services/gcm/gcm_desktop_util.*.

chrome/chrome_common.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     # File lists shared with GN build.
     'chrome_common_sources': [
       'common/all_messages.h',
       'common/attrition_experiments.h',
@@ skipping 35 matching lines @@
       'common/component_flash_hint_file_linux.h',
       'common/component_flash_hint_file_linux.cc',
       'common/content_restriction.h',
       'common/content_settings_pattern_serializer.cc',
       'common/content_settings_pattern_serializer.h',
       'common/crash_keys.cc',
       'common/crash_keys.h',
       'common/custom_handlers/protocol_handler.cc',
       'common/custom_handlers/protocol_handler.h',
       'common/descriptors_android.h',
-      'common/gcm_desktop_util.cc',
-      'common/gcm_desktop_util.h',
       'common/icon_with_badge_image_source.cc',
       'common/icon_with_badge_image_source.h',
       'common/ini_parser.cc',
       'common/ini_parser.h',
       'common/instant_types.cc',
       'common/instant_types.h',
       'common/localized_error.cc',
       'common/localized_error.h',
       'common/logging_chrome.cc',
       'common/logging_chrome.h',
@@ skipping 591 matching lines @@
       'sources': [
         'common/resource_usage_reporter.mojom',
       ],
       'dependencies': [
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
   ],
 }