Revert 270226 "Componentize GCM Part 1: create GCM component and..."

trunk/src/chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 19 matching lines @@
         '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:bookmarks_core_browser',
         '../components/components.gyp:captive_portal',
         '../components/components.gyp:cloud_devices_common',
         '../components/components.gyp:component_metrics_proto',
         '../components/components.gyp:data_reduction_proxy_browser',
         '../components/components.gyp:domain_reliability',
         '../components/components.gyp:favicon_base',
         '../components/components.gyp:favicon_core',
         '../components/components.gyp:feedback_component',
-        '../components/components.gyp:gcm_driver',
         '../components/components.gyp:infobars_core',
         '../components/components.gyp:invalidation',
         '../components/components.gyp:metrics',
         '../components/components.gyp:navigation_metrics',
         '../components/components.gyp:os_crypt',
         '../components/components.gyp:password_manager_core_browser',
         '../components/components.gyp:password_manager_core_common',
         '../components/components.gyp:policy_component',
         '../components/components.gyp:precache_core',
         '../components/components.gyp:query_parser',
         '../components/components.gyp:rappor',
         '../components/components.gyp:search_provider_logos',
         '../components/components.gyp:signin_core_browser',
         '../components/components.gyp:startup_metric_utils',
         '../components/components.gyp:sync_driver',
         '../components/components.gyp:translate_core_browser',
         '../components/components.gyp:translate_core_common',
         '../components/components.gyp:user_prefs',
         '../components/components_strings.gyp:components_strings',
         # This depends directly on the variations target, rather than just
         # transitively via the common target because the proto sources need to
         # be generated before code in this target can start building.
         '../components/components.gyp:variations',
         '../components/components.gyp:webdata_common',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../courgette/courgette.gyp:courgette_lib',
         '../crypto/crypto.gyp:crypto',
+        '../google_apis/gcm/gcm.gyp:gcm',
         '../google_apis/google_apis.gyp:google_apis',
         '../jingle/jingle.gyp:notifier',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libjingle/libjingle.gyp:libjingle',
@@ skipping 1899 matching lines @@
         'browser/search_engines/template_url_prepopulate_data.h',
         'browser/search_engines/template_url_service.cc',
         'browser/search_engines/template_url_service.h',
         'browser/search_engines/template_url_service_android.cc',
         'browser/search_engines/template_url_service_android.h',
         'browser/search_engines/template_url_service_factory.cc',
         'browser/search_engines/template_url_service_factory.h',
         'browser/search_engines/template_url_service_observer.h',
         'browser/search_engines/util.cc',
         'browser/search_engines/util.h',
+        'browser/services/gcm/default_gcm_app_handler.cc',
+        'browser/services/gcm/default_gcm_app_handler.h',
+        'browser/services/gcm/gcm_app_handler.h',
+        'browser/services/gcm/gcm_client_factory.cc',
+        'browser/services/gcm/gcm_client_factory.h',
         'browser/services/gcm/gcm_profile_service.cc',
         'browser/services/gcm/gcm_profile_service.h',
         'browser/services/gcm/gcm_profile_service_factory.cc',
         'browser/services/gcm/gcm_profile_service_factory.h',
         'browser/services/gcm/gcm_service.cc',
         'browser/services/gcm/gcm_service.h',
         'browser/service_process/service_process_control.cc',
         'browser/service_process/service_process_control_mac.mm',
         'browser/service_process/service_process_control.h',
         'browser/sessions/base_session_service.cc',
@@ skipping 1709 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }