| Index: chrome/browser/services/gcm/gcm_profile_service.h
|
| diff --git a/chrome/browser/services/gcm/gcm_profile_service.h b/chrome/browser/services/gcm/gcm_profile_service.h
|
| index 70b61122e529bee3fcb6f54257705cdc52739d74..df05dbb3a7cbca0f8c14a8196b76c66689ca5def 100644
|
| --- a/chrome/browser/services/gcm/gcm_profile_service.h
|
| +++ b/chrome/browser/services/gcm/gcm_profile_service.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "chrome/browser/services/gcm/push_messaging_service_impl.h"
|
| // TODO(jianli): include needed for obsolete methods that are going to be
|
| // removed soon.
|
| #include "components/gcm_driver/gcm_driver.h"
|
| @@ -58,6 +59,10 @@ class GCMProfileService : public KeyedService {
|
|
|
| GCMDriver* driver() const { return driver_.get(); }
|
|
|
| + content::PushMessagingService* push_messaging_service() {
|
| + return &push_messaging_service_;
|
| + }
|
| +
|
| protected:
|
| // Used for constructing fake GCMProfileService for testing purpose.
|
| GCMProfileService();
|
| @@ -68,6 +73,9 @@ class GCMProfileService : public KeyedService {
|
|
|
| scoped_ptr<GCMDriver> driver_;
|
|
|
| + // Implementation of content::PushMessagingService using GCMProfileService.
|
| + PushMessagingServiceImpl push_messaging_service_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
|
| };
|
|
|
|
|