Standardize usage of virtual/override/final in google_apis/

This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.

BUG=417463
TBR=rogerta@chromium.org

Review URL: https://codereview.chromium.org/649283003

Cr-Commit-Position: refs/heads/master@{#300495}

14 files changed, 154 insertions, 161 deletions

diff --git a/google_apis/gcm/base/fake_encryptor.h b/google_apis/gcm/base/fake_encryptor.h
index 894d50b..4277292 100644
--- a/google_apis/gcm/base/fake_encryptor.h
+++ b/google_apis/gcm/base/fake_encryptor.h
@@ -14,13 +14,13 @@ namespace gcm {
 // ciphertext.  Obviously, this should be used only for testing.
 class FakeEncryptor : public Encryptor {
  public:
-  virtual ~FakeEncryptor();
+  ~FakeEncryptor() override;
 
-  virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) override;
+  bool EncryptString(const std::string& plaintext,
+                     std::string* ciphertext) override;
 
-  virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) override;
+  bool DecryptString(const std::string& ciphertext,
+                     std::string* plaintext) override;
 };
 
 }  // namespace gcm
diff --git a/google_apis/gcm/base/socket_stream.h b/google_apis/gcm/base/socket_stream.h
index 4a490f2..527056a 100644
--- a/google_apis/gcm/base/socket_stream.h
+++ b/google_apis/gcm/base/socket_stream.h
@@ -63,13 +63,13 @@ class GCM_EXPORT SocketInputStream
 
   // |socket| should already be connected.
   explicit SocketInputStream(net::StreamSocket* socket);
-  virtual ~SocketInputStream();
+  ~SocketInputStream() override;
 
   // ZeroCopyInputStream implementation.
-  virtual bool Next(const void** data, int* size) override;
-  virtual void BackUp(int count) override;
-  virtual bool Skip(int count) override;  // Not implemented.
-  virtual int64 ByteCount() const override;
+  bool Next(const void** data, int* size) override;
+  void BackUp(int count) override;
+  bool Skip(int count) override;  // Not implemented.
+  int64 ByteCount() const override;
 
   // The remaining amount of valid data available to be read.
   int UnreadByteCount() const;
@@ -159,12 +159,12 @@ class GCM_EXPORT SocketOutputStream
 
   // |socket| should already be connected.
   explicit SocketOutputStream(net::StreamSocket* socket);
-  virtual ~SocketOutputStream();
+  ~SocketOutputStream() override;
 
   // ZeroCopyOutputStream implementation.
-  virtual bool Next(void** data, int* size) override;
-  virtual void BackUp(int count) override;
-  virtual int64 ByteCount() const override;
+  bool Next(void** data, int* size) override;
+  void BackUp(int count) override;
+  int64 ByteCount() const override;
 
   // Writes the buffer into the Socket.
   net::Error Flush(const base::Closure& callback);
diff --git a/google_apis/gcm/engine/checkin_request.h b/google_apis/gcm/engine/checkin_request.h
index af9e48f..e3ad8ed 100644
--- a/google_apis/gcm/engine/checkin_request.h
+++ b/google_apis/gcm/engine/checkin_request.h
@@ -64,12 +64,12 @@ class GCM_EXPORT CheckinRequest : public net::URLFetcherDelegate {
                  const CheckinRequestCallback& callback,
                  net::URLRequestContextGetter* request_context_getter,
                  GCMStatsRecorder* recorder);
-  virtual ~CheckinRequest();
+  ~CheckinRequest() override;
 
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt, informs the backoff of a previous request's
diff --git a/google_apis/gcm/engine/connection_factory_impl.h b/google_apis/gcm/engine/connection_factory_impl.h
index 21eeedbe..b28e8f6 100644
--- a/google_apis/gcm/engine/connection_factory_impl.h
+++ b/google_apis/gcm/engine/connection_factory_impl.h
@@ -42,23 +42,23 @@ class GCM_EXPORT ConnectionFactoryImpl :
       const scoped_refptr<net::HttpNetworkSession>& http_network_session,
       net::NetLog* net_log,
       GCMStatsRecorder* recorder);
-  virtual ~ConnectionFactoryImpl();
+  ~ConnectionFactoryImpl() override;
 
   // ConnectionFactory implementation.
-  virtual void Initialize(
+  void Initialize(
       const BuildLoginRequestCallback& request_builder,
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
       const ConnectionHandler::ProtoSentCallback& write_callback) override;
-  virtual ConnectionHandler* GetConnectionHandler() const override;
-  virtual void Connect() override;
-  virtual bool IsEndpointReachable() const override;
-  virtual std::string GetConnectionStateString() const override;
-  virtual base::TimeTicks NextRetryAttempt() const override;
-  virtual void SignalConnectionReset(ConnectionResetReason reason) override;
-  virtual void SetConnectionListener(ConnectionListener* listener) override;
+  ConnectionHandler* GetConnectionHandler() const override;
+  void Connect() override;
+  bool IsEndpointReachable() const override;
+  std::string GetConnectionStateString() const override;
+  base::TimeTicks NextRetryAttempt() const override;
+  void SignalConnectionReset(ConnectionResetReason reason) override;
+  void SetConnectionListener(ConnectionListener* listener) override;
 
   // NetworkChangeObserver implementation.
-  virtual void OnNetworkChanged(
+  void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Returns the server to which the factory is currently connected, or if
diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
index 415602ed..af04fb7 100644
--- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc
+++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
@@ -83,9 +83,9 @@ void WriteContinuation() {
 class TestBackoffEntry : public net::BackoffEntry {
  public:
   explicit TestBackoffEntry(base::SimpleTestTickClock* tick_clock);
-  virtual ~TestBackoffEntry();
+  ~TestBackoffEntry() override;
 
-  virtual base::TimeTicks ImplGetTimeNow() const override;
+  base::TimeTicks ImplGetTimeNow() const override;
 
  private:
   base::SimpleTestTickClock* tick_clock_;
@@ -107,22 +107,22 @@ base::TimeTicks TestBackoffEntry::ImplGetTimeNow() const {
 class TestConnectionFactoryImpl : public ConnectionFactoryImpl {
  public:
   TestConnectionFactoryImpl(const base::Closure& finished_callback);
-  virtual ~TestConnectionFactoryImpl();
+  ~TestConnectionFactoryImpl() override;
 
   void InitializeFactory();
 
   // Overridden stubs.
-  virtual void ConnectImpl() override;
-  virtual void InitHandler() override;
-  virtual scoped_ptr<net::BackoffEntry> CreateBackoffEntry(
+  void ConnectImpl() override;
+  void InitHandler() override;
+  scoped_ptr<net::BackoffEntry> CreateBackoffEntry(
       const net::BackoffEntry::Policy* const policy) override;
-  virtual scoped_ptr<ConnectionHandler> CreateConnectionHandler(
+  scoped_ptr<ConnectionHandler> CreateConnectionHandler(
       base::TimeDelta read_timeout,
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
       const ConnectionHandler::ProtoSentCallback& write_callback,
       const ConnectionHandler::ConnectionChangedCallback& connection_callback)
-          override;
-  virtual base::TimeTicks NowTicks() override;
+      override;
+  base::TimeTicks NowTicks() override;
 
   // Helpers for verifying connection attempts are made. Connection results
   // must be consumed.
@@ -266,9 +266,9 @@ class ConnectionFactoryImplTest
   void WaitForConnections();
 
   // ConnectionFactory::ConnectionListener
-  virtual void OnConnected(const GURL& current_server,
-                           const net::IPEndPoint& ip_endpoint) override;
-  virtual void OnDisconnected() override;
+  void OnConnected(const GURL& current_server,
+                   const net::IPEndPoint& ip_endpoint) override;
+  void OnDisconnected() override;
 
  private:
   void ConnectionsComplete();
diff --git a/google_apis/gcm/engine/connection_handler_impl.h b/google_apis/gcm/engine/connection_handler_impl.h
index 296bf6d..fc965fb 100644
--- a/google_apis/gcm/engine/connection_handler_impl.h
+++ b/google_apis/gcm/engine/connection_handler_impl.h
@@ -30,15 +30,14 @@ class GCM_EXPORT ConnectionHandlerImpl : public ConnectionHandler {
       const ProtoReceivedCallback& read_callback,
       const ProtoSentCallback& write_callback,
       const ConnectionChangedCallback& connection_callback);
-  virtual ~ConnectionHandlerImpl();
+  ~ConnectionHandlerImpl() override;
 
   // ConnectionHandler implementation.
-  virtual void Init(const mcs_proto::LoginRequest& login_request,
-                    net::StreamSocket* socket) override;
-  virtual void Reset() override;
-  virtual bool CanSendMessage() const override;
-  virtual void SendMessage(const google::protobuf::MessageLite& message)
-      override;
+  void Init(const mcs_proto::LoginRequest& login_request,
+            net::StreamSocket* socket) override;
+  void Reset() override;
+  bool CanSendMessage() const override;
+  void SendMessage(const google::protobuf::MessageLite& message) override;
 
  private:
   // State machine for handling incoming data. See WaitForData(..) for usage.
diff --git a/google_apis/gcm/engine/fake_connection_factory.h b/google_apis/gcm/engine/fake_connection_factory.h
index dfba154..9826270 100644
--- a/google_apis/gcm/engine/fake_connection_factory.h
+++ b/google_apis/gcm/engine/fake_connection_factory.h
@@ -17,20 +17,20 @@ class FakeConnectionHandler;
 class FakeConnectionFactory : public ConnectionFactory {
  public:
   FakeConnectionFactory();
-  virtual ~FakeConnectionFactory();
+  ~FakeConnectionFactory() override;
 
   // ConnectionFactory implementation.
-  virtual void Initialize(
+  void Initialize(
       const BuildLoginRequestCallback& request_builder,
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
       const ConnectionHandler::ProtoSentCallback& write_callback) override;
-  virtual ConnectionHandler* GetConnectionHandler() const override;
-  virtual void Connect() override;
-  virtual bool IsEndpointReachable() const override;
-  virtual std::string GetConnectionStateString() const override;
-  virtual base::TimeTicks NextRetryAttempt() const override;
-  virtual void SignalConnectionReset(ConnectionResetReason reason) override;
-  virtual void SetConnectionListener(ConnectionListener* listener) override;
+  ConnectionHandler* GetConnectionHandler() const override;
+  void Connect() override;
+  bool IsEndpointReachable() const override;
+  std::string GetConnectionStateString() const override;
+  base::TimeTicks NextRetryAttempt() const override;
+  void SignalConnectionReset(ConnectionResetReason reason) override;
+  void SetConnectionListener(ConnectionListener* listener) override;
 
   // Whether a connection reset has been triggered and is yet to run.
   bool reconnect_pending() const { return reconnect_pending_; }
diff --git a/google_apis/gcm/engine/fake_connection_handler.h b/google_apis/gcm/engine/fake_connection_handler.h
index e176e3a..4e43d12 100644
--- a/google_apis/gcm/engine/fake_connection_handler.h
+++ b/google_apis/gcm/engine/fake_connection_handler.h
@@ -19,15 +19,14 @@ class FakeConnectionHandler : public ConnectionHandler {
   FakeConnectionHandler(
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
       const ConnectionHandler::ProtoSentCallback& write_callback);
-  virtual ~FakeConnectionHandler();
+  ~FakeConnectionHandler() override;
 
   // ConnectionHandler implementation.
-  virtual void Init(const mcs_proto::LoginRequest& login_request,
-                    net::StreamSocket* socket) override;
-  virtual void Reset() override;
-  virtual bool CanSendMessage() const override;
-  virtual void SendMessage(const google::protobuf::MessageLite& message)
-      override;
+  void Init(const mcs_proto::LoginRequest& login_request,
+            net::StreamSocket* socket) override;
+  void Reset() override;
+  bool CanSendMessage() const override;
+  void SendMessage(const google::protobuf::MessageLite& message) override;
 
   // EXPECT's receipt of |message| via SendMessage(..).
   void ExpectOutgoingMessage(const MCSMessage& message);
diff --git a/google_apis/gcm/engine/gcm_store_impl.h b/google_apis/gcm/engine/gcm_store_impl.h
index b597d6f..283b920 100644
--- a/google_apis/gcm/engine/gcm_store_impl.h
+++ b/google_apis/gcm/engine/gcm_store_impl.h
@@ -28,70 +28,68 @@ class GCM_EXPORT GCMStoreImpl : public GCMStore {
   GCMStoreImpl(const base::FilePath& path,
                scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
                scoped_ptr<Encryptor> encryptor);
-  virtual ~GCMStoreImpl();
+  ~GCMStoreImpl() override;
 
   // Load the directory and pass the initial state back to caller.
-  virtual void Load(const LoadCallback& callback) override;
+  void Load(const LoadCallback& callback) override;
 
   // Closes the GCM store.
-  virtual void Close() override;
+  void Close() override;
 
   // Clears the GCM store of all data and destroys any LevelDB files associated
   // with this store.
   // WARNING: this will permanently destroy any pending outgoing messages
   // and require the device to re-create credentials and serial number mapping
   // tables.
-  virtual void Destroy(const UpdateCallback& callback) override;
+  void Destroy(const UpdateCallback& callback) override;
 
   // Sets this device's messaging credentials.
-  virtual void SetDeviceCredentials(uint64 device_android_id,
-                                    uint64 device_security_token,
-                                    const UpdateCallback& callback) override;
+  void SetDeviceCredentials(uint64 device_android_id,
+                            uint64 device_security_token,
+                            const UpdateCallback& callback) override;
 
   // Registration info.
-  virtual void AddRegistration(const std::string& app_id,
-                               const linked_ptr<RegistrationInfo>& registration,
-                               const UpdateCallback& callback) override;
-  virtual void RemoveRegistration(const std::string& app_id,
-                                  const UpdateCallback& callback) override;
+  void AddRegistration(const std::string& app_id,
+                       const linked_ptr<RegistrationInfo>& registration,
+                       const UpdateCallback& callback) override;
+  void RemoveRegistration(const std::string& app_id,
+                          const UpdateCallback& callback) override;
 
   // Unacknowledged incoming message handling.
-  virtual void AddIncomingMessage(const std::string& persistent_id,
-                                  const UpdateCallback& callback) override;
-  virtual void RemoveIncomingMessage(const std::string& persistent_id,
-                                     const UpdateCallback& callback) override;
-  virtual void RemoveIncomingMessages(const PersistentIdList& persistent_ids,
-                                      const UpdateCallback& callback) override;
+  void AddIncomingMessage(const std::string& persistent_id,
+                          const UpdateCallback& callback) override;
+  void RemoveIncomingMessage(const std::string& persistent_id,
+                             const UpdateCallback& callback) override;
+  void RemoveIncomingMessages(const PersistentIdList& persistent_ids,
+                              const UpdateCallback& callback) override;
 
   // Unacknowledged outgoing messages handling.
-  virtual bool AddOutgoingMessage(const std::string& persistent_id,
-                                  const MCSMessage& message,
-                                  const UpdateCallback& callback) override;
-  virtual void OverwriteOutgoingMessage(const std::string& persistent_id,
-                                        const MCSMessage& message,
-                                        const UpdateCallback& callback)
-      override;
-  virtual void RemoveOutgoingMessage(const std::string& persistent_id,
-                                     const UpdateCallback& callback) override;
-  virtual void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
-                                      const UpdateCallback& callback) override;
+  bool AddOutgoingMessage(const std::string& persistent_id,
+                          const MCSMessage& message,
+                          const UpdateCallback& callback) override;
+  void OverwriteOutgoingMessage(const std::string& persistent_id,
+                                const MCSMessage& message,
+                                const UpdateCallback& callback) override;
+  void RemoveOutgoingMessage(const std::string& persistent_id,
+                             const UpdateCallback& callback) override;
+  void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
+                              const UpdateCallback& callback) override;
 
   // Sets last device's checkin information.
-  virtual void SetLastCheckinInfo(const base::Time& time,
-                                  const std::set<std::string>& accounts,
-                                  const UpdateCallback& callback) override;
+  void SetLastCheckinInfo(const base::Time& time,
+                          const std::set<std::string>& accounts,
+                          const UpdateCallback& callback) override;
 
   // G-service settings handling.
-  virtual void SetGServicesSettings(
-      const std::map<std::string, std::string>& settings,
-      const std::string& settings_digest,
-      const UpdateCallback& callback) override;
+  void SetGServicesSettings(const std::map<std::string, std::string>& settings,
+                            const std::string& settings_digest,
+                            const UpdateCallback& callback) override;
 
   // Sets the account information related to device to account mapping.
-  virtual void AddAccountMapping(const AccountMapping& account_mapping,
-                                 const UpdateCallback& callback) override;
-  virtual void RemoveAccountMapping(const std::string& account_id,
-                                    const UpdateCallback& callback) override;
+  void AddAccountMapping(const AccountMapping& account_mapping,
+                         const UpdateCallback& callback) override;
+  void RemoveAccountMapping(const std::string& account_id,
+                            const UpdateCallback& callback) override;
 
  private:
   typedef std::map<std::string, int> AppIdToMessageCountMap;
diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc
index 348531b..b72fa69 100644
--- a/google_apis/gcm/engine/mcs_client_unittest.cc
+++ b/google_apis/gcm/engine/mcs_client_unittest.cc
@@ -74,7 +74,7 @@ class TestMCSClient : public MCSClient {
       next_id_(0) {
   }
 
-  virtual std::string GetNextPersistentId() override {
+  std::string GetNextPersistentId() override {
     return base::UintToString(++next_id_);
   }
 
diff --git a/google_apis/gcm/engine/registration_request.h b/google_apis/gcm/engine/registration_request.h
index 736f4b4..1f707b9 100644
--- a/google_apis/gcm/engine/registration_request.h
+++ b/google_apis/gcm/engine/registration_request.h
@@ -89,12 +89,12 @@ class GCM_EXPORT RegistrationRequest : public net::URLFetcherDelegate {
       int max_retry_count,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       GCMStatsRecorder* recorder);
-  virtual ~RegistrationRequest();
+  ~RegistrationRequest() override;
 
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt, informs the backoff of a previous request's
diff --git a/google_apis/gcm/engine/unregistration_request.h b/google_apis/gcm/engine/unregistration_request.h
index 39887ab..c5c0eb5 100644
--- a/google_apis/gcm/engine/unregistration_request.h
+++ b/google_apis/gcm/engine/unregistration_request.h
@@ -80,13 +80,13 @@ class GCM_EXPORT UnregistrationRequest : public net::URLFetcherDelegate {
       const UnregistrationCallback& callback,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       GCMStatsRecorder* recorder);
-  virtual ~UnregistrationRequest();
+  ~UnregistrationRequest() override;
 
   // Starts an unregistration request.
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt and informs the backoff of previous request's
diff --git a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
index 9e8646e..d4503dd 100644
--- a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
+++ b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
@@ -13,54 +13,51 @@ namespace gcm {
 class FakeGCMStatsRecorder : public GCMStatsRecorder {
  public:
   FakeGCMStatsRecorder();
-  virtual ~FakeGCMStatsRecorder();
+  ~FakeGCMStatsRecorder() override;
 
-  virtual void RecordCheckinInitiated(uint64 android_id) override;
-  virtual void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
-  virtual void RecordCheckinSuccess() override;
-  virtual void RecordCheckinFailure(std::string status,
-                                    bool will_retry) override;
-  virtual void RecordConnectionInitiated(const std::string& host) override;
-  virtual void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
-  virtual void RecordConnectionSuccess() override;
-  virtual void RecordConnectionFailure(int network_error) override;
-  virtual void RecordConnectionResetSignaled(
+  void RecordCheckinInitiated(uint64 android_id) override;
+  void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
+  void RecordCheckinSuccess() override;
+  void RecordCheckinFailure(std::string status, bool will_retry) override;
+  void RecordConnectionInitiated(const std::string& host) override;
+  void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
+  void RecordConnectionSuccess() override;
+  void RecordConnectionFailure(int network_error) override;
+  void RecordConnectionResetSignaled(
       ConnectionFactory::ConnectionResetReason reason) override;
-  virtual void RecordRegistrationSent(const std::string& app_id,
-                                      const std::string& sender_ids) override;
-  virtual void RecordRegistrationResponse(
-      const std::string& app_id,
-      const std::vector<std::string>& sender_ids,
-      RegistrationRequest::Status status) override;
-  virtual void RecordRegistrationRetryRequested(
+  void RecordRegistrationSent(const std::string& app_id,
+                              const std::string& sender_ids) override;
+  void RecordRegistrationResponse(const std::string& app_id,
+                                  const std::vector<std::string>& sender_ids,
+                                  RegistrationRequest::Status status) override;
+  void RecordRegistrationRetryRequested(
       const std::string& app_id,
       const std::vector<std::string>& sender_ids,
       int retries_left) override;
-  virtual void RecordUnregistrationSent(const std::string& app_id) override;
-  virtual void RecordUnregistrationResponse(
+  void RecordUnregistrationSent(const std::string& app_id) override;
+  void RecordUnregistrationResponse(
       const std::string& app_id,
       UnregistrationRequest::Status status) override;
-  virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
-                                                int64 delay_msec) override;
-  virtual void RecordDataMessageReceived(
-      const std::string& app_id,
-      const std::string& from,
-      int message_byte_size,
-      bool to_registered_app,
-      ReceivedMessageType message_type) override;
-  virtual void RecordDataSentToWire(const std::string& app_id,
-                                    const std::string& receiver_id,
-                                    const std::string& message_id,
-                                    int queued) override;
-  virtual void RecordNotifySendStatus(const std::string& app_id,
-                                      const std::string& receiver_id,
-                                      const std::string& message_id,
-                                      MCSClient::MessageSendStatus status,
-                                      int byte_size,
-                                      int ttl) override;
-  virtual void RecordIncomingSendError(const std::string& app_id,
-                                       const std::string& receiver_id,
-                                       const std::string& message_id) override;
+  void RecordUnregistrationRetryDelayed(const std::string& app_id,
+                                        int64 delay_msec) override;
+  void RecordDataMessageReceived(const std::string& app_id,
+                                 const std::string& from,
+                                 int message_byte_size,
+                                 bool to_registered_app,
+                                 ReceivedMessageType message_type) override;
+  void RecordDataSentToWire(const std::string& app_id,
+                            const std::string& receiver_id,
+                            const std::string& message_id,
+                            int queued) override;
+  void RecordNotifySendStatus(const std::string& app_id,
+                              const std::string& receiver_id,
+                              const std::string& message_id,
+                              MCSClient::MessageSendStatus status,
+                              int byte_size,
+                              int ttl) override;
+  void RecordIncomingSendError(const std::string& app_id,
+                               const std::string& receiver_id,
+                               const std::string& message_id) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeGCMStatsRecorder);
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc
index 7c83afc..cbee95f 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -139,7 +139,7 @@ class MyTestURLRequestContext : public net::TestURLRequestContext {
     Init();
   }
 
-  virtual ~MyTestURLRequestContext() {}
+  ~MyTestURLRequestContext() override {}
 };
 
 class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
@@ -148,7 +148,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
       const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy)
       : TestURLRequestContextGetter(io_message_loop_proxy) {}
 
-  virtual net::TestURLRequestContext* GetURLRequestContext() override {
+  net::TestURLRequestContext* GetURLRequestContext() override {
     // Construct |context_| lazily so it gets constructed on the right
     // thread (the IO thread).
     if (!context_)
@@ -157,7 +157,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
   }
 
  private:
-  virtual ~MyTestURLRequestContextGetter() {}
+  ~MyTestURLRequestContextGetter() override {}
 
   scoped_ptr<MyTestURLRequestContext> context_;
 };
@@ -166,20 +166,20 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
 class MyTestCertVerifier : public net::CertVerifier {
  public:
   MyTestCertVerifier() {}
-  virtual ~MyTestCertVerifier() {}
-
-  virtual int Verify(net::X509Certificate* cert,
-                     const std::string& hostname,
-                     int flags,
-                     net::CRLSet* crl_set,
-                     net::CertVerifyResult* verify_result,
-                     const net::CompletionCallback& callback,
-                     RequestHandle* out_req,
-                     const net::BoundNetLog& net_log) override {
+  ~MyTestCertVerifier() override {}
+
+  int Verify(net::X509Certificate* cert,
+             const std::string& hostname,
+             int flags,
+             net::CRLSet* crl_set,
+             net::CertVerifyResult* verify_result,
+             const net::CompletionCallback& callback,
+             RequestHandle* out_req,
+             const net::BoundNetLog& net_log) override {
     return net::OK;
   }
 
-  virtual void CancelRequest(RequestHandle req) override {
+  void CancelRequest(RequestHandle req) override {
     // Do nothing.
   }
 };