Removing the mock-keychain related bool from GCMStore constructor

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 0349270d119738edd14e63989cb478f3b67101f0..4d43211e2c4ad7bfdd34042bc853b27553394c5b 100644
--- a/google_apis/gcm/gcm_client_impl.h
+++ b/google_apis/gcm/gcm_client_impl.h
@@ -14,6 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "google_apis/gcm/base/mcs_message.h"
+#include "google_apis/gcm/engine/gcm_internals_builder.h"
 #include "google_apis/gcm/engine/gcm_store.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/engine/registration_request.h"
@@ -23,10 +24,9 @@
 #include "net/base/net_log.h"
 #include "net/url_request/url_request_context_getter.h"
 
-class GURL;
-
 namespace base {
 class Clock;
+class FilePath;
 }  // namespace base
 
 namespace net {
@@ -39,26 +39,6 @@ class CheckinRequest;
 class ConnectionFactory;
 class GCMClientImplTest;
 
-// Helper class for building GCM internals. Allows tests to inject fake versions
-// as necessary.
-class GCM_EXPORT GCMInternalsBuilder {
- public:
-  GCMInternalsBuilder();
-  virtual ~GCMInternalsBuilder();
-
-  virtual scoped_ptr<base::Clock> BuildClock();
-  virtual scoped_ptr<MCSClient> BuildMCSClient(
-      const std::string& version,
-      base::Clock* clock,
-      ConnectionFactory* connection_factory,
-      GCMStore* gcm_store);
-  virtual scoped_ptr<ConnectionFactory> BuildConnectionFactory(
-      const std::vector<GURL>& endpoints,
-      const net::BackoffEntry::Policy& backoff_policy,
-      scoped_refptr<net::HttpNetworkSession> network_session,
-      net::NetLog* net_log);
-};
-
 // Implements the GCM Client. It is used to coordinate MCS Client (communication
 // with MCS) and other pieces of GCM infrastructure like Registration and
 // Checkins. It also allows for registering user delegates that host