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

trunk/src/google_apis/gcm/gcm.gyp

 # Copyright 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': {
     'chromium_code': 1,
   },
 
   'targets': [
@@ skipping 13 matching lines @@
       ],
       'defines': [
         'GCM_IMPLEMENTATION',
       ],
       'export_dependent_settings': [
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite'
       ],
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../components/components.gyp:os_crypt',
         '../../net/net.gyp:net',
         '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../../url/url.gyp:url_lib',
       ],
       'sources': [
         'base/mcs_message.cc',
         'base/mcs_message.h',
         'base/mcs_util.cc',
         'base/mcs_util.h',
@@ skipping 49 matching lines @@
         '../..',
       ],
       'dependencies': [
         '../../base/base.gyp:base',
         '../../net/net.gyp:net',
         '../../net/net.gyp:net_test_support',
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'gcm'
       ],
       'sources': [
-        'base/fake_encryptor.cc',
-        'base/fake_encryptor.h',
         'tools/mcs_probe.cc',
       ],
     },
 
     # The main GCM unit tests.
     {
       'target_name': 'gcm_unit_tests',
       'type': '<(gtest_target_type)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '../..',
       ],
       'export_dependent_settings': [
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite'
       ],
       'dependencies': [
         '../../base/base.gyp:run_all_unittests',
         '../../base/base.gyp:base',
+        '../../components/components.gyp:os_crypt',
         '../../net/net.gyp:net',
         '../../net/net.gyp:net_test_support',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'gcm'
       ],
       'sources': [
-        'base/fake_encryptor.cc',
-        'base/fake_encryptor.h',
         'base/mcs_message_unittest.cc',
         'base/mcs_util_unittest.cc',
         'base/socket_stream_unittest.cc',
         'engine/checkin_request_unittest.cc',
         'engine/connection_factory_impl_unittest.cc',
         'engine/connection_handler_impl_unittest.cc',
         'engine/fake_connection_factory.cc',
         'engine/fake_connection_factory.h',
         'engine/fake_connection_handler.cc',
         'engine/fake_connection_handler.h',
         'engine/gcm_store_impl_unittest.cc',
         'engine/gservices_settings_unittest.cc',
         'engine/heartbeat_manager_unittest.cc',
         'engine/mcs_client_unittest.cc',
         'engine/registration_request_unittest.cc',
         'engine/unregistration_request_unittest.cc',
         'gcm_client_impl_unittest.cc',
         'monitoring/gcm_stats_recorder_unittest.cc'
       ]
     },
   ],
 }