Removing the mock-keychain related bool from GCMStore constructor

google_apis/gcm/gcm_client_impl.cc

 // 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.
 
 #include "google_apis/gcm/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
-#include "base/time/default_clock.h"
+#include "base/time/clock.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/checkin_request.h"
-#include "google_apis/gcm/engine/connection_factory_impl.h"
-#include "google_apis/gcm/engine/gcm_store_impl.h"
+#include "google_apis/gcm/engine/connection_factory.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/http/http_network_session.h"
 #include "net/url_request/url_request_context.h"
 #include "url/gurl.h"
 
 namespace gcm {
 
 namespace {
 
@@ skipping 81 matching lines @@
     return DELETED_MESSAGES;
   if (kMessageTypeSendErrorKey == value)
     return SEND_ERROR;
   if (kMessageTypeDataMessage == value)
     return DATA_MESSAGE;
   return UNKNOWN;
 }
 
 }  // namespace
 
-GCMInternalsBuilder::GCMInternalsBuilder() {}
-GCMInternalsBuilder::~GCMInternalsBuilder() {}
-
-scoped_ptr<base::Clock> GCMInternalsBuilder::BuildClock() {
-  return make_scoped_ptr<base::Clock>(new base::DefaultClock());
-}
-
-scoped_ptr<MCSClient> GCMInternalsBuilder::BuildMCSClient(
-    const std::string& version,
-    base::Clock* clock,
-    ConnectionFactory* connection_factory,
-    GCMStore* gcm_store) {
-  return make_scoped_ptr<MCSClient>(
-      new MCSClient(version,
-                    clock,
-                    connection_factory,
-                    gcm_store));
-}
-
-scoped_ptr<ConnectionFactory> GCMInternalsBuilder::BuildConnectionFactory(
-      const std::vector<GURL>& endpoints,
-      const net::BackoffEntry::Policy& backoff_policy,
-      scoped_refptr<net::HttpNetworkSession> network_session,
-      net::NetLog* net_log) {
-  return make_scoped_ptr<ConnectionFactory>(
-      new ConnectionFactoryImpl(endpoints,
-                                backoff_policy,
-                                network_session,
-                                net_log));
-}
-
 GCMClientImpl::GCMClientImpl(scoped_ptr<GCMInternalsBuilder> internals_builder)
     : internals_builder_(internals_builder.Pass()),
       state_(UNINITIALIZED),
       clock_(internals_builder_->BuildClock()),
       url_request_context_getter_(NULL),
       pending_registration_requests_deleter_(&pending_registration_requests_),
       pending_unregistration_requests_deleter_(
           &pending_unregistration_requests_),
       weak_ptr_factory_(this) {
 }
@@ skipping 16 matching lines @@
   url_request_context_getter_ = url_request_context_getter;
   const net::HttpNetworkSession::Params* network_session_params =
       url_request_context_getter_->GetURLRequestContext()->
           GetNetworkSessionParams();
   DCHECK(network_session_params);
   network_session_ = new net::HttpNetworkSession(*network_session_params);
 
   chrome_build_proto_.CopyFrom(chrome_build_proto);
   account_ids_ = account_ids;
 
-  gcm_store_.reset(new GCMStoreImpl(false, path, blocking_task_runner));
+  gcm_store_ =
+      internals_builder_->BuildGCMStore(path, blocking_task_runner).Pass();
 
   delegate_ = delegate;
 
   state_ = INITIALIZED;
 }
 
 void GCMClientImpl::Load() {
   DCHECK_EQ(INITIALIZED, state_);
 
   // Once the loading is completed, the check-in will be initiated.
@@ skipping 489 matching lines @@
   if (iter != send_error_details.additional_data.end()) {
     send_error_details.message_id = iter->second;
     send_error_details.additional_data.erase(iter);
   }
 
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
 }  // namespace gcm