| Index: chrome/browser/services/gcm/fake_gcm_client_factory.h
|
| diff --git a/chrome/browser/services/gcm/fake_gcm_client_factory.h b/chrome/browser/services/gcm/fake_gcm_client_factory.h
|
| index ba6c74a12de4de060a57e487aff22fc5cfc3e416..cc5bcef8499cef9e2fa3a13b374e397927e42b2f 100644
|
| --- a/chrome/browser/services/gcm/fake_gcm_client_factory.h
|
| +++ b/chrome/browser/services/gcm/fake_gcm_client_factory.h
|
| @@ -7,8 +7,8 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "chrome/browser/services/gcm/gcm_client_factory.h"
|
| #include "chrome/browser/services/gcm/gcm_client_mock.h"
|
| +#include "components/gcm/gcm_client_factory.h"
|
|
|
| namespace gcm {
|
|
|
| @@ -21,7 +21,8 @@ class FakeGCMClientFactory : public GCMClientFactory {
|
| virtual ~FakeGCMClientFactory();
|
|
|
| // GCMClientFactory:
|
| - virtual scoped_ptr<GCMClient> BuildInstance() OVERRIDE;
|
| + virtual scoped_ptr<GCMClient> BuildInstance(
|
| + scoped_ptr<Encryptor> encryptor) OVERRIDE;
|
|
|
| private:
|
| GCMClientMock::LoadingDelay gcm_client_loading_delay_;
|
|
|