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

google_apis/gcm/gcm_client.cc

Index: google_apis/gcm/gcm_client.cc
diff --git a/google_apis/gcm/gcm_client.cc b/google_apis/gcm/gcm_client.cc
index 316e58f822c146dadbddb3abe5e7a7beefda6340..49ee5d5c02d80315daf04e12b1f60768961d3e3a 100644
--- a/google_apis/gcm/gcm_client.cc
+++ b/google_apis/gcm/gcm_client.cc
@@ -4,20 +4,8 @@
 
 #include "google_apis/gcm/gcm_client.h"
 
-#include "base/lazy_instance.h"
-#include "google_apis/gcm/gcm_client_impl.h"
-
 namespace gcm {
 
-namespace {
-
-static base::LazyInstance<GCMClientImpl>::Leaky g_gcm_client =
-    LAZY_INSTANCE_INITIALIZER;
-static GCMClient::TestingFactoryFunction g_gcm_client_factory = NULL;
-static GCMClient* g_gcm_client_override = NULL;
-
-}  // namespace
-
 GCMClient::OutgoingMessage::OutgoingMessage()
     : time_to_live(0) {
 }
@@ -31,24 +19,4 @@ GCMClient::IncomingMessage::IncomingMessage() {
 GCMClient::IncomingMessage::~IncomingMessage() {
 }
 
-// static
-GCMClient* GCMClient::Get() {
-  if (g_gcm_client_override)
-    return g_gcm_client_override;
-  if (g_gcm_client_factory) {
-    g_gcm_client_override = g_gcm_client_factory();
-    return g_gcm_client_override;
-  }
-  return g_gcm_client.Pointer();
-}
-
-// static
-void GCMClient::SetTestingFactory(TestingFactoryFunction factory) {
-  if (g_gcm_client_override) {
-    delete g_gcm_client_override;
-    g_gcm_client_override = NULL;
-  }
-  g_gcm_client_factory = factory;
-}
-
 }  // namespace gcm