Index: google_apis/gcm/gcm_client_impl.cc |
diff --git a/google_apis/gcm/gcm_client_impl.cc b/google_apis/gcm/gcm_client_impl.cc |
index a0a2142f2167aca1d681e7a320605bdba02f7e11..286b08a6590fcce70ba78fc55135800dcaad8540 100644 |
--- a/google_apis/gcm/gcm_client_impl.cc |
+++ b/google_apis/gcm/gcm_client_impl.cc |
@@ -14,6 +14,7 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/stringprintf.h" |
#include "base/time/default_clock.h" |
+#include "google_apis/gcm/base/encryptor.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" |
@@ -176,6 +177,7 @@ void GCMClientImpl::Initialize( |
const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner, |
const scoped_refptr<net::URLRequestContextGetter>& |
url_request_context_getter, |
+ scoped_ptr<Encryptor> encryptor, |
Delegate* delegate) { |
DCHECK_EQ(UNINITIALIZED, state_); |
DCHECK(url_request_context_getter); |
@@ -191,7 +193,8 @@ void GCMClientImpl::Initialize( |
chrome_build_proto_.CopyFrom(chrome_build_proto); |
account_ids_ = account_ids; |
- gcm_store_.reset(new GCMStoreImpl(path, blocking_task_runner)); |
+ gcm_store_.reset( |
+ new GCMStoreImpl(path, blocking_task_runner, encryptor.Pass())); |
delegate_ = delegate; |