Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2551)

Unified Diff: chrome/browser/services/gcm/gcm_service.cc

Issue 261853012: Componentize GCM Part 1: create GCM component and move some files over (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());

Powered by Google App Engine
This is Rietveld 408576698