[GCM] Adding status to AccountMapping structure

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 27 matching lines @@
         '../../url/url.gyp:url_lib',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'base/mcs_message.cc',
         'base/mcs_message.h',
         'base/mcs_util.cc',
         'base/mcs_util.h',
         'base/socket_stream.cc',
         'base/socket_stream.h',
-        'engine/account_info.cc',
-        'engine/account_info.h',
+        'engine/account_mapping.cc',
+        'engine/account_mapping.h',
         'engine/checkin_request.cc',
         'engine/checkin_request.h',
         'engine/connection_factory.cc',
         'engine/connection_factory.h',
         'engine/connection_factory_impl.cc',
         'engine/connection_factory_impl.h',
         'engine/connection_handler.cc',
         'engine/connection_handler.h',
         'engine/connection_handler_impl.cc',
         'engine/connection_handler_impl.h',
@@ skipping 94 matching lines @@
         '../../net/net.gyp:net_test_support',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'gcm',
         'gcm_test_support'
       ],
       'sources': [
         'base/mcs_message_unittest.cc',
         'base/mcs_util_unittest.cc',
         'base/socket_stream_unittest.cc',
-        'engine/account_info_unittest.cc',
+        'engine/account_mapping_unittest.cc',
         'engine/checkin_request_unittest.cc',
         'engine/connection_factory_impl_unittest.cc',
         'engine/connection_handler_impl_unittest.cc',
         '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',
       ]
     },
   ],
 }