| 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 0b5c74dc601e0143b80e6e65927317069ebc740f..bbd90880aa5c9e27d1df0ac58eeb1dc3d82c367d 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/gcm_app_handler.h"
|
| +#include "components/gcm/gcm_client_factory.h"
|
| +#include "components/gcm/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"
|
| @@ -192,7 +193,8 @@ 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(
|
| + make_scoped_ptr<Encryptor>(new SystemEncryptor)).Pass();
|
|
|
| checkin_proto::ChromeBuildProto chrome_build_proto;
|
| chrome_build_proto.set_platform(GetPlatform());
|
|
|