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

google_apis/gcm/gcm_client.h

 // 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.
 
 #ifndef GOOGLE_APIS_GCM_GCM_CLIENT_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #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
 // Messaging server. This interface is not supposed to be thread-safe.
 class GCM_EXPORT GCMClient {
  public:
   enum Result {
     // Successful operation.
     SUCCESS,
     // Invalid parameter.
@@ skipping 93 matching lines @@
                                     Result result) = 0;
 
     // Returns the checkin info associated with this user. The delegate class
     // is expected to persist the checkin info that is provided by
     // OnCheckInFinished.
     virtual CheckinInfo GetCheckinInfo() const = 0;
 
     // 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.
   // |delegate|: the delegate whose methods will be called asynchronously in
   //             response to events and messages.
   virtual void SetUserDelegate(const std::string& username,
                                Delegate* delegate) = 0;
 
   // Checks in the user to use GCM. If the device has not been checked in, it
   // will be done first.
@@ skipping 27 matching lines @@
   // |app_id|: application ID.
   // |receiver_id|: registration ID of the receiver party.
   // |message|: message to be sent.
   virtual void Send(const std::string& username,
                     const std::string& app_id,
                     const std::string& receiver_id,
                     const OutgoingMessage& message) = 0;
 
   // Returns true if the loading from the persistent store is still in progress.
   virtual bool IsLoading() const = 0;
-
- protected:
-  virtual ~GCMClient() {}
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_H_