[GCM] Reland: Introduce GCMClientFactory to create GCMClient for GCMProfileService

google_apis/gcm/gcm_client.h

Index: google_apis/gcm/gcm_client.h
diff --git a/google_apis/gcm/gcm_client.h b/google_apis/gcm/gcm_client.h
index 26bb065bdba6a160b8485090e3c90d0f318c7d5f..914bb83cbe05df4af14544946f82f8bd89477f8f 100644
--- a/google_apis/gcm/gcm_client.h
+++ b/google_apis/gcm/gcm_client.h
@@ -12,10 +12,6 @@
 #include "base/basictypes.h"
 #include "google_apis/gcm/base/gcm_export.h"
 
-namespace base {
-class TaskRunner;
-}
-
 namespace gcm {
 
 // Interface that encapsulates the network communications with the Google Cloud
@@ -129,19 +125,10 @@ class GCM_EXPORT GCMClient {
     // Called when the loading from the persistent store is done. The loading
     // is triggered asynchronously when GCMClient is created.
     virtual void OnLoadingCompleted() = 0;
-
-    // Returns a task runner for file operations that may block. This is used
-    // in writing to or reading from the persistent store.
-    virtual base::TaskRunner* GetFileTaskRunner() = 0;
   };
 
-  // Returns the single instance. Multiple profiles share the same client
-  // that makes use of the same MCS connection.
-  static GCMClient* Get();
-
-  // Passes a mocked instance for testing purpose.
-  typedef GCMClient* (*TestingFactoryFunction)();
-  static void SetTestingFactory(TestingFactoryFunction factory);
+  GCMClient();
+  virtual ~GCMClient();
 
   // Sets the delegate to interact with related to a specific user.
   // |username|: the username (email address) used to check in with the server.
@@ -189,9 +176,6 @@ class GCM_EXPORT GCMClient {
 
   // Returns true if the loading from the persistent store is still in progress.
   virtual bool IsLoading() const = 0;
-
- protected:
-  virtual ~GCMClient() {}
 };
 
 }  // namespace gcm