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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/services/gcm/gcm_client_mock.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sys_byteorder.h"
 #include "base/time/time.h"
 #include "content/public/browser/browser_thread.h"
-#include "google_apis/gcm/base/encryptor.h"
 
 namespace gcm {
 
 GCMClientMock::GCMClientMock(StartMode start_mode)
     : delegate_(NULL),
       status_(UNINITIALIZED),
       start_mode_(start_mode),
       weak_ptr_factory_(this) {
 }
 
 GCMClientMock::~GCMClientMock() {
 }
 
 void GCMClientMock::Initialize(
     const checkin_proto::ChromeBuildProto& chrome_build_proto,
     const base::FilePath& store_path,
     const std::vector<std::string>& account_ids,
     const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
     const scoped_refptr<net::URLRequestContextGetter>&
         url_request_context_getter,
-    scoped_ptr<Encryptor> encryptor,
     Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void GCMClientMock::Start() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   DCHECK_NE(STARTED, status_);
 
   if (start_mode_ == DELAY_START)
     return;
@@ skipping 165 matching lines @@
 }
 
 void GCMClientMock::MessageSendError(
     const std::string& app_id,
     const GCMClient::SendErrorDetails& send_error_details) {
   if (delegate_)
     delegate_->OnMessageSendError(app_id, send_error_details);
 }
 
 }  // namespace gcm