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

components/gcm/gcm_client_factory.h

Index: components/gcm/gcm_client_factory.h
diff --git a/chrome/browser/services/gcm/gcm_client_factory.h b/components/gcm/gcm_client_factory.h
similarity index 69%
rename from chrome/browser/services/gcm/gcm_client_factory.h
rename to components/gcm/gcm_client_factory.h
index 9112399cc24b4876933f46b061ae5d0b920750ca..5cb87cf8bef06c3ac168fe41c39bb1e29d873de7 100644
--- a/chrome/browser/services/gcm/gcm_client_factory.h
+++ b/components/gcm/gcm_client_factory.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SERVICES_GCM_GCM_CLIENT_FACTORY_H_
-#define CHROME_BROWSER_SERVICES_GCM_GCM_CLIENT_FACTORY_H_
+#ifndef COMPONENTS_GCM_GCM_CLIENT_FACTORY_H_
+#define COMPONENTS_GCM_GCM_CLIENT_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace gcm {
 
+class Encryptor;
 class GCMClient;
 
 class GCMClientFactory {
@@ -19,7 +20,7 @@ class GCMClientFactory {
 
   // Creates a new instance of GCMClient. The testing code could override this
   // to provide a mocked instance.
-  virtual scoped_ptr<GCMClient> BuildInstance();
+  virtual scoped_ptr<GCMClient> BuildInstance(scoped_ptr<Encryptor> encryptor);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMClientFactory);
@@ -27,4 +28,4 @@ class GCMClientFactory {
 
 }  // namespace gcm
 
-#endif  // CHROME_BROWSER_SERVICES_GCM_GCM_CLIENT_FACTORY_H_
+#endif  // COMPONENTS_GCM_GCM_CLIENT_FACTORY_H_