Revert 270226 "Componentize GCM Part 1: create GCM component and..."

trunk/src/chrome/browser/services/gcm/gcm_service.cc

Index: trunk/src/chrome/browser/services/gcm/gcm_service.cc
===================================================================
--- trunk/src/chrome/browser/services/gcm/gcm_service.cc	(revision 270233)
+++ trunk/src/chrome/browser/services/gcm/gcm_service.cc	(working copy)
@@ -13,10 +13,9 @@
 #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"
@@ -194,7 +193,7 @@
         url_request_context_getter) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
-  gcm_client_ = gcm_client_factory->BuildInstance();
+  gcm_client_ = gcm_client_factory->BuildInstance().Pass();
 
   checkin_proto::ChromeBuildProto chrome_build_proto;
   chrome_build_proto.set_platform(GetPlatform());
@@ -213,7 +212,6 @@
                           account_ids,
                           blocking_task_runner,
                           url_request_context_getter,
-                          make_scoped_ptr<Encryptor>(new SystemEncryptor),
                           this);
 }