Standardize usage of virtual/override/final in sync/

sync/tools/sync_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 61 matching lines @@
 class MyTestURLRequestContext : public net::TestURLRequestContext {
  public:
   MyTestURLRequestContext() : TestURLRequestContext(true) {
     context_storage_.set_host_resolver(
         net::HostResolver::CreateDefaultResolver(NULL));
     context_storage_.set_transport_security_state(
         new net::TransportSecurityState());
     Init();
   }
 
-  virtual ~MyTestURLRequestContext() {}
+  ~MyTestURLRequestContext() override {}
 };
 
 class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
  public:
   explicit MyTestURLRequestContextGetter(
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
       : TestURLRequestContextGetter(io_task_runner) {}
 
-  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_)
       context_.reset(new MyTestURLRequestContext());
     return context_.get();
   }
 
  private:
-  virtual ~MyTestURLRequestContextGetter() {}
+  ~MyTestURLRequestContextGetter() override {}
 
   scoped_ptr<MyTestURLRequestContext> context_;
 };
 
 // TODO(akalin): Use system encryptor once it's moved to sync/.
 class NullEncryptor : public Encryptor {
  public:
-  virtual ~NullEncryptor() {}
+  ~NullEncryptor() override {}
 
-  virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) override {
+  bool EncryptString(const std::string& plaintext,
+                     std::string* ciphertext) override {
     *ciphertext = plaintext;
     return true;
   }
 
-  virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) override {
+  bool DecryptString(const std::string& ciphertext,
+                     std::string* plaintext) override {
     *plaintext = ciphertext;
     return true;
   }
 };
 
 std::string ValueToString(const base::Value& value) {
   std::string str;
   base::JSONWriter::Write(&value, &str);
   return str;
 }
 
 class LoggingChangeDelegate : public SyncManager::ChangeDelegate {
  public:
-  virtual ~LoggingChangeDelegate() {}
+  ~LoggingChangeDelegate() override {}
 
-  virtual void OnChangesApplied(
-      ModelType model_type,
-      int64 model_version,
-      const BaseTransaction* trans,
-      const ImmutableChangeRecordList& changes) override {
+  void OnChangesApplied(ModelType model_type,
+                        int64 model_version,
+                        const BaseTransaction* trans,
+                        const ImmutableChangeRecordList& changes) override {
     LOG(INFO) << "Changes applied for "
               << ModelTypeToString(model_type);
     size_t i = 1;
     size_t change_count = changes.Get().size();
     for (ChangeRecordList::const_iterator it =
              changes.Get().begin(); it != changes.Get().end(); ++it) {
       scoped_ptr<base::DictionaryValue> change_value(it->ToValue());
       LOG(INFO) << "Change (" << i << "/" << change_count << "): "
                 << ValueToString(*change_value);
       if (it->action != ChangeRecord::ACTION_DELETE) {
         ReadNode node(trans);
         CHECK_EQ(node.InitByIdLookup(it->id), BaseNode::INIT_OK);
         scoped_ptr<base::DictionaryValue> details(node.ToValue());
         VLOG(1) << "Details: " << ValueToString(*details);
       }
       ++i;
     }
   }
 
-  virtual void OnChangesComplete(ModelType model_type) override {
+  void OnChangesComplete(ModelType model_type) override {
     LOG(INFO) << "Changes complete for "
               << ModelTypeToString(model_type);
   }
 };
 
 class LoggingUnrecoverableErrorHandler
     : public UnrecoverableErrorHandler {
  public:
-  virtual ~LoggingUnrecoverableErrorHandler() {}
+  ~LoggingUnrecoverableErrorHandler() override {}
 
-  virtual void OnUnrecoverableError(const tracked_objects::Location& from_here,
-                                    const std::string& message) override {
+  void OnUnrecoverableError(const tracked_objects::Location& from_here,
+                            const std::string& message) override {
     if (LOG_IS_ON(ERROR)) {
       logging::LogMessage(from_here.file_name(), from_here.line_number(),
                           logging::LOG_ERROR).stream()
           << message;
     }
   }
 };
 
 class LoggingJsEventHandler
     : public JsEventHandler,
       public base::SupportsWeakPtr<LoggingJsEventHandler> {
  public:
-  virtual ~LoggingJsEventHandler() {}
+  ~LoggingJsEventHandler() override {}
 
-  virtual void HandleJsEvent(
-      const std::string& name,
-      const JsEventDetails& details) override {
+  void HandleJsEvent(const std::string& name,
+                     const JsEventDetails& details) override {
     VLOG(1) << name << ": " << details.ToString();
   }
 };
 
 class InvalidationAdapter : public syncer::InvalidationInterface {
  public:
   explicit InvalidationAdapter(const syncer::Invalidation& invalidation)
       : invalidation_(invalidation) {}
-  virtual ~InvalidationAdapter() {}
+  ~InvalidationAdapter() override {}
 
-  virtual bool IsUnknownVersion() const override {
+  bool IsUnknownVersion() const override {
     return invalidation_.is_unknown_version();
   }
 
-  virtual const std::string& GetPayload() const override {
+  const std::string& GetPayload() const override {
     return invalidation_.payload();
   }
 
-  virtual int64 GetVersion() const override {
-    return invalidation_.version();
-  }
+  int64 GetVersion() const override { return invalidation_.version(); }
 
-  virtual void Acknowledge() override {
-    invalidation_.Acknowledge();
-  }
+  void Acknowledge() override { invalidation_.Acknowledge(); }
 
-  virtual void Drop() override {
-    invalidation_.Drop();
-  }
+  void Drop() override { invalidation_.Drop(); }
 
  private:
   syncer::Invalidation invalidation_;
 };
 
 class InvalidatorShim : public InvalidationHandler {
  public:
   explicit InvalidatorShim(SyncManager* sync_manager)
       : sync_manager_(sync_manager) {}
 
-  virtual void OnInvalidatorStateChange(InvalidatorState state) override {
+  void OnInvalidatorStateChange(InvalidatorState state) override {
     sync_manager_->SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED);
   }
 
-  virtual void OnIncomingInvalidation(
+  void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) override {
     syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
     for (syncer::ObjectIdSet::const_iterator ids_it = ids.begin();
          ids_it != ids.end();
          ++ids_it) {
       syncer::ModelType type;
       if (!NotificationTypeToRealModelType(ids_it->name(), &type)) {
         DLOG(WARNING) << "Notification has invalid id: "
                       << syncer::ObjectIdToString(*ids_it);
       } else {
         syncer::SingleObjectInvalidationSet invalidation_set =
             invalidation_map.ForObject(*ids_it);
         for (syncer::SingleObjectInvalidationSet::const_iterator inv_it =
                  invalidation_set.begin();
              inv_it != invalidation_set.end();
              ++inv_it) {
           scoped_ptr<syncer::InvalidationInterface> inv_adapter(
               new InvalidationAdapter(*inv_it));
           sync_manager_->OnIncomingInvalidation(type, inv_adapter.Pass());
         }
       }
     }
   }
 
-  virtual std::string GetOwnerName() const override {
-    return "InvalidatorShim";
-  }
+  std::string GetOwnerName() const override { return "InvalidatorShim"; }
 
  private:
   SyncManager* sync_manager_;
 };
 
 void LogUnrecoverableErrorContext() {
   base::debug::StackTrace().Print();
 }
 
 notifier::NotifierOptions ParseNotifierOptions(
@@ skipping 196 matching lines @@
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }