Rename GCMStatsRecorder to GCMStatsRecorderImpl

google_apis/gcm/gcm.gyp

Index: google_apis/gcm/gcm.gyp
diff --git a/google_apis/gcm/gcm.gyp b/google_apis/gcm/gcm.gyp
index 33365f0b3f85c9324f4b5f088f0f4ce0bae8f048..b496281b24f648bf2723f137020730af66f569e8 100644
--- a/google_apis/gcm/gcm.gyp
+++ b/google_apis/gcm/gcm.gyp
@@ -75,8 +75,9 @@
         'gcm_client.h',
         'gcm_client_impl.cc',
         'gcm_client_impl.h',
-        'monitoring/gcm_stats_recorder.cc',
         'monitoring/gcm_stats_recorder.h',
+        'monitoring/gcm_stats_recorder_impl.cc',
+        'monitoring/gcm_stats_recorder_impl.h',
         'protocol/android_checkin.proto',
         'protocol/checkin.proto',
         'protocol/mcs.proto',
@@ -86,6 +87,34 @@
       ],
     },
 
+    # The test support library that is needed to test gcm.
+    {
+      'target_name': 'gcm_test_support',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
+      'export_dependent_settings': [
+        '../../third_party/protobuf/protobuf.gyp:protobuf_lite'
+      ],
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
+        '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+        'gcm',
+      ],
+      'sources': [
+        'base/fake_encryptor.cc',
+        'base/fake_encryptor.h',
+        'engine/fake_connection_factory.cc',
+        'engine/fake_connection_factory.h',
+        'engine/fake_connection_handler.cc',
+        'engine/fake_connection_handler.h',
+        'monitoring/fake_gcm_stats_recorder.cc',
+        'monitoring/fake_gcm_stats_recorder.h',
+      ],
+    },    
+
     # A standalone MCS (mobile connection server) client.
     {
       'target_name': 'mcs_probe',
@@ -99,11 +128,10 @@
         '../../net/net.gyp:net',
         '../../net/net.gyp:net_test_support',
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        'gcm'
+        'gcm',
+        'gcm_test_support'
       ],
       'sources': [
-        'base/fake_encryptor.cc',
-        'base/fake_encryptor.h',
         'tools/mcs_probe.cc',
       ],
     },
@@ -127,21 +155,16 @@
         '../../testing/gtest.gyp:gtest',
         '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'mcs_probe',
-        'gcm'
+        'gcm',
+        'gcm_test_support'
       ],
       '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',
@@ -149,7 +172,7 @@
         'engine/registration_request_unittest.cc',
         'engine/unregistration_request_unittest.cc',
         'gcm_client_impl_unittest.cc',
-        'monitoring/gcm_stats_recorder_unittest.cc'
+        'monitoring/gcm_stats_recorder_impl_unittest.cc'
       ]
     },
   ],