Componentize GCM Part 1: create GCM component and move some files over

chrome/browser/services/gcm/fake_gcm_client_factory.cc

 // Copyright 2014 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/fake_gcm_client_factory.h"
 
 #include "base/memory/scoped_ptr.h"
+#include "google_apis/gcm/base/encryptor.h"
 #include "google_apis/gcm/gcm_client.h"
 
 namespace gcm {
 
 FakeGCMClientFactory::FakeGCMClientFactory(
     GCMClientMock::LoadingDelay gcm_client_loading_delay)
     : gcm_client_loading_delay_(gcm_client_loading_delay) {
 }
 
 FakeGCMClientFactory::~FakeGCMClientFactory() {
 }
 
-scoped_ptr<GCMClient> FakeGCMClientFactory::BuildInstance() {
-  return scoped_ptr<GCMClient>(new GCMClientMock(gcm_client_loading_delay_));
+scoped_ptr<GCMClient> FakeGCMClientFactory::BuildInstance(
+    scoped_ptr<Encryptor> encryptor) {
+  return scoped_ptr<GCMClient>(new GCMClientMock(

[fgorski, 2014/05/07 18:27:55]

nit: did you split this line on purpose?

[jianli, 2014/05/07 19:12:29]

Reverted. This is a leftover from undoing previous change.

+      gcm_client_loading_delay_));
 }
 
 }  // namespace gcm