Index: chrome/browser/services/gcm/gcm_service.cc |
diff --git a/chrome/browser/services/gcm/gcm_service.cc b/chrome/browser/services/gcm/gcm_service.cc |
index 4a33e0c64bc9315a9d278effd5e32f4e60a723db..a8e6227e4935932f104b9829f6e7139e6da1a4b5 100644 |
--- a/chrome/browser/services/gcm/gcm_service.cc |
+++ b/chrome/browser/services/gcm/gcm_service.cc |
@@ -13,9 +13,10 @@ |
#include "base/logging.h" |
#include "base/sequenced_task_runner.h" |
#include "base/threading/sequenced_worker_pool.h" |
-#include "chrome/browser/services/gcm/gcm_app_handler.h" |
-#include "chrome/browser/services/gcm/gcm_client_factory.h" |
#include "chrome/common/chrome_version_info.h" |
+#include "components/gcm_driver/gcm_app_handler.h" |
+#include "components/gcm_driver/gcm_client_factory.h" |
+#include "components/gcm_driver/system_encryptor.h" |
#include "content/public/browser/browser_thread.h" |
#include "google_apis/gaia/oauth2_token_service.h" |
#include "google_apis/gcm/protocol/android_checkin.pb.h" |
@@ -193,7 +194,7 @@ void GCMService::IOWorker::Initialize( |
url_request_context_getter) { |
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
- gcm_client_ = gcm_client_factory->BuildInstance().Pass(); |
+ gcm_client_ = gcm_client_factory->BuildInstance(); |
checkin_proto::ChromeBuildProto chrome_build_proto; |
chrome_build_proto.set_platform(GetPlatform()); |
@@ -212,6 +213,7 @@ void GCMService::IOWorker::Initialize( |
account_ids, |
blocking_task_runner, |
url_request_context_getter, |
+ make_scoped_ptr<Encryptor>(new SystemEncryptor), |
this); |
} |