Removing the mock-keychain related bool from GCMStore constructor

google_apis/gcm/gcm_client_impl.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_IMPL_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "google_apis/gcm/engine/unregistration_request.h"
 #include "google_apis/gcm/gcm_client.h"
 #include "google_apis/gcm/protocol/android_checkin.pb.h"
 #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 {
 class HttpNetworkSession;
 }  // namespace net
 
 namespace gcm {
 
 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
 // applications that send and receive messages.
 class GCM_EXPORT GCMClientImpl : public GCMClient {
  public:
   explicit GCMClientImpl(scoped_ptr<GCMInternalsBuilder> internals_builder);
   virtual ~GCMClientImpl();
 
   // Overridden from GCMClient:
@@ skipping 187 matching lines @@
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_