| Index: components/gcm_driver/fake_gcm_driver.h
|
| diff --git a/components/gcm_driver/fake_gcm_driver.h b/components/gcm_driver/fake_gcm_driver.h
|
| index 366881e3dd4423c625d9234b452004b04168bd0f..e1e5d02eef6eb471b33de15b9e9225c2124360af 100644
|
| --- a/components/gcm_driver/fake_gcm_driver.h
|
| +++ b/components/gcm_driver/fake_gcm_driver.h
|
| @@ -14,44 +14,41 @@ namespace gcm {
|
| class FakeGCMDriver : public GCMDriver {
|
| public:
|
| FakeGCMDriver();
|
| - virtual ~FakeGCMDriver();
|
| + ~FakeGCMDriver() override;
|
|
|
| // GCMDriver overrides:
|
| - virtual void Shutdown() override;
|
| - virtual void AddAppHandler(const std::string& app_id,
|
| - GCMAppHandler* handler) override;
|
| - virtual void RemoveAppHandler(const std::string& app_id) override;
|
| - virtual void OnSignedIn() override;
|
| - virtual void OnSignedOut() override;
|
| - virtual void Purge() override;
|
| - virtual void AddConnectionObserver(GCMConnectionObserver* observer) override;
|
| - virtual void RemoveConnectionObserver(
|
| - GCMConnectionObserver* observer) override;
|
| - virtual void Enable() override;
|
| - virtual void Disable() override;
|
| - virtual GCMClient* GetGCMClientForTesting() const override;
|
| - virtual bool IsStarted() const override;
|
| - virtual bool IsConnected() const override;
|
| - virtual void GetGCMStatistics(const GetGCMStatisticsCallback& callback,
|
| - bool clear_logs) override;
|
| - virtual void SetGCMRecording(const GetGCMStatisticsCallback& callback,
|
| - bool recording) override;
|
| - virtual void SetAccountTokens(
|
| + void Shutdown() override;
|
| + void AddAppHandler(const std::string& app_id,
|
| + GCMAppHandler* handler) override;
|
| + void RemoveAppHandler(const std::string& app_id) override;
|
| + void OnSignedIn() override;
|
| + void OnSignedOut() override;
|
| + void Purge() override;
|
| + void AddConnectionObserver(GCMConnectionObserver* observer) override;
|
| + void RemoveConnectionObserver(GCMConnectionObserver* observer) override;
|
| + void Enable() override;
|
| + void Disable() override;
|
| + GCMClient* GetGCMClientForTesting() const override;
|
| + bool IsStarted() const override;
|
| + bool IsConnected() const override;
|
| + void GetGCMStatistics(const GetGCMStatisticsCallback& callback,
|
| + bool clear_logs) override;
|
| + void SetGCMRecording(const GetGCMStatisticsCallback& callback,
|
| + bool recording) override;
|
| + void SetAccountTokens(
|
| const std::vector<GCMClient::AccountTokenInfo>& account_tokens) override;
|
| - virtual void UpdateAccountMapping(
|
| - const AccountMapping& account_mapping) override;
|
| - virtual void RemoveAccountMapping(const std::string& account_id) override;
|
| + void UpdateAccountMapping(const AccountMapping& account_mapping) override;
|
| + void RemoveAccountMapping(const std::string& account_id) override;
|
|
|
| protected:
|
| // GCMDriver implementation:
|
| - virtual GCMClient::Result EnsureStarted() override;
|
| - virtual void RegisterImpl(
|
| - const std::string& app_id,
|
| - const std::vector<std::string>& sender_ids) override;
|
| - virtual void UnregisterImpl(const std::string& app_id) override;
|
| - virtual void SendImpl(const std::string& app_id,
|
| - const std::string& receiver_id,
|
| - const GCMClient::OutgoingMessage& message) override;
|
| + GCMClient::Result EnsureStarted() override;
|
| + void RegisterImpl(const std::string& app_id,
|
| + const std::vector<std::string>& sender_ids) override;
|
| + void UnregisterImpl(const std::string& app_id) override;
|
| + void SendImpl(const std::string& app_id,
|
| + const std::string& receiver_id,
|
| + const GCMClient::OutgoingMessage& message) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(FakeGCMDriver);
|
|
|