Componentize GCM Part 1: create GCM component and move some files over

google_apis/gcm/gcm_client_impl.h

Index: google_apis/gcm/gcm_client_impl.h
diff --git a/google_apis/gcm/gcm_client_impl.h b/google_apis/gcm/gcm_client_impl.h
index f38a08d9d5b3f6cbe381079066d04e5203465407..cffa671d893f616a4c733a5a6a6a12191a010d85 100644
--- a/google_apis/gcm/gcm_client_impl.h
+++ b/google_apis/gcm/gcm_client_impl.h
@@ -44,6 +44,7 @@ namespace gcm {
 
 class CheckinRequest;
 class ConnectionFactory;
+class Encryptor;
 class GCMClientImplTest;
 class GServicesSettings;
 
@@ -75,7 +76,8 @@ class GCM_EXPORT GCMInternalsBuilder {
 // applications that send and receive messages.
 class GCM_EXPORT GCMClientImpl : public GCMClient {
  public:
-  explicit GCMClientImpl(scoped_ptr<GCMInternalsBuilder> internals_builder);
+  GCMClientImpl(scoped_ptr<GCMInternalsBuilder> internals_builder,
+                scoped_ptr<Encryptor> encryptor);
   virtual ~GCMClientImpl();
 
   // Overridden from GCMClient:
@@ -225,6 +227,9 @@ class GCM_EXPORT GCMClientImpl : public GCMClient {
   // Builder for the GCM internals (mcs client, etc.).
   scoped_ptr<GCMInternalsBuilder> internals_builder_;
 
+  // For encryption purpose.
+  scoped_ptr<Encryptor> encryptor_;
+
   // Recorder that logs GCM activities.
   GCMStatsRecorder recorder_;