| Index: chrome/browser/sync/test/integration/fake_server_invalidation_service.h
 | 
| diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
 | 
| index af397eaf5e5e84973cb781bc598a6f0bee647d07..25b1d31ab7569611c665b24821c4df9a7737eea9 100644
 | 
| --- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
 | 
| +++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
 | 
| @@ -30,19 +30,19 @@ class FakeServerInvalidationService : public invalidation::InvalidationService,
 | 
|    virtual ~FakeServerInvalidationService();
 | 
|  
 | 
|    virtual void RegisterInvalidationHandler(
 | 
| -      syncer::InvalidationHandler* handler) OVERRIDE;
 | 
| +      syncer::InvalidationHandler* handler) override;
 | 
|    virtual void UpdateRegisteredInvalidationIds(
 | 
|        syncer::InvalidationHandler* handler,
 | 
| -      const syncer::ObjectIdSet& ids) OVERRIDE;
 | 
| +      const syncer::ObjectIdSet& ids) override;
 | 
|    virtual void UnregisterInvalidationHandler(
 | 
| -      syncer::InvalidationHandler* handler) OVERRIDE;
 | 
| +      syncer::InvalidationHandler* handler) override;
 | 
|  
 | 
| -  virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
 | 
| -  virtual std::string GetInvalidatorClientId() const OVERRIDE;
 | 
| -  virtual invalidation::InvalidationLogger* GetInvalidationLogger() OVERRIDE;
 | 
| +  virtual syncer::InvalidatorState GetInvalidatorState() const override;
 | 
| +  virtual std::string GetInvalidatorClientId() const override;
 | 
| +  virtual invalidation::InvalidationLogger* GetInvalidationLogger() override;
 | 
|    virtual void RequestDetailedStatus(
 | 
| -      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
 | 
| -  virtual IdentityProvider* GetIdentityProvider() OVERRIDE;
 | 
| +      base::Callback<void(const base::DictionaryValue&)> caller) const override;
 | 
| +  virtual IdentityProvider* GetIdentityProvider() override;
 | 
|  
 | 
|    // Functions to enable or disable sending of self-notifications.  In the real
 | 
|    // world, clients do not receive notifications of their own commits.
 | 
| @@ -52,7 +52,7 @@ class FakeServerInvalidationService : public invalidation::InvalidationService,
 | 
|    // FakeServer::Observer:
 | 
|    virtual void OnCommit(
 | 
|        const std::string& committer_id,
 | 
| -      syncer::ModelTypeSet committed_model_types) OVERRIDE;
 | 
| +      syncer::ModelTypeSet committed_model_types) override;
 | 
|  
 | 
|   private:
 | 
|    std::string client_id_;
 | 
| 
 |