Index: chrome/browser/services/gcm/fake_gcm_client_factory.cc |
diff --git a/chrome/browser/services/gcm/fake_gcm_client_factory.cc b/chrome/browser/services/gcm/fake_gcm_client_factory.cc |
index 2d1d23c8c3d4458f44bd2df4c9d1021f50fdf566..0fc5f80bc1a8efad6e7880a410e673f198d5b1eb 100644 |
--- a/chrome/browser/services/gcm/fake_gcm_client_factory.cc |
+++ b/chrome/browser/services/gcm/fake_gcm_client_factory.cc |
@@ -5,6 +5,7 @@ |
#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 { |
@@ -17,8 +18,10 @@ FakeGCMClientFactory::FakeGCMClientFactory( |
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
|
+ gcm_client_loading_delay_)); |
} |
} // namespace gcm |