replace OVERRIDE and FINAL with override and final in chromeos/

chromeos/dbus/update_engine_client.cc

Index: chromeos/dbus/update_engine_client.cc
diff --git a/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc
index f1866f5cfb99a0acf9c36d9b968553bc56aecd9d..ad6e7a39c05b7618ea1c6fc983c9225d528579f1 100644
--- a/chromeos/dbus/update_engine_client.cc
+++ b/chromeos/dbus/update_engine_client.cc
@@ -83,20 +83,20 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
   }
 
   // UpdateEngineClient implementation:
-  virtual void AddObserver(Observer* observer) OVERRIDE {
+  virtual void AddObserver(Observer* observer) override {
     observers_.AddObserver(observer);
   }
 
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {
+  virtual void RemoveObserver(Observer* observer) override {
     observers_.RemoveObserver(observer);
   }
 
-  virtual bool HasObserver(Observer* observer) OVERRIDE {
+  virtual bool HasObserver(Observer* observer) override {
     return observers_.HasObserver(observer);
   }
 
   virtual void RequestUpdateCheck(
-      const UpdateCheckCallback& callback) OVERRIDE {
+      const UpdateCheckCallback& callback) override {
     dbus::MethodCall method_call(
         update_engine::kUpdateEngineInterface,
         update_engine::kAttemptUpdate);
@@ -113,7 +113,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
                    callback));
   }
 
-  virtual void RebootAfterUpdate() OVERRIDE {
+  virtual void RebootAfterUpdate() override {
     dbus::MethodCall method_call(
         update_engine::kUpdateEngineInterface,
         update_engine::kRebootIfNeeded);
@@ -126,7 +126,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual void Rollback() OVERRIDE {
+  virtual void Rollback() override {
     VLOG(1) << "Requesting a rollback";
      dbus::MethodCall method_call(
         update_engine::kUpdateEngineInterface,
@@ -143,7 +143,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
 
 
   virtual void CanRollbackCheck(
-      const RollbackCheckCallback& callback) OVERRIDE {
+      const RollbackCheckCallback& callback) override {
     dbus::MethodCall method_call(
         update_engine::kUpdateEngineInterface,
         update_engine::kCanRollback);
@@ -157,12 +157,12 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
                    callback));
   }
 
-  virtual Status GetLastStatus() OVERRIDE {
+  virtual Status GetLastStatus() override {
     return last_status_;
   }
 
   virtual void SetChannel(const std::string& target_channel,
-                          bool is_powerwash_allowed) OVERRIDE {
+                          bool is_powerwash_allowed) override {
     if (!IsValidChannel(target_channel)) {
       LOG(ERROR) << "Invalid channel name: " << target_channel;
       return;
@@ -186,7 +186,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
   }
 
   virtual void GetChannel(bool get_current_channel,
-                          const GetChannelCallback& callback) OVERRIDE {
+                          const GetChannelCallback& callback) override {
     dbus::MethodCall method_call(
         update_engine::kUpdateEngineInterface,
         update_engine::kGetChannel);
@@ -204,7 +204,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
   }
 
  protected:
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     update_engine_proxy_ = bus->GetObjectProxy(
         update_engine::kUpdateEngineServiceName,
         dbus::ObjectPath(update_engine::kUpdateEngineServicePath));
@@ -402,31 +402,31 @@ class UpdateEngineClientStubImpl : public UpdateEngineClient {
         target_channel_(kReleaseChannelBeta) {}
 
   // UpdateEngineClient implementation:
-  virtual void Init(dbus::Bus* bus) OVERRIDE {}
-  virtual void AddObserver(Observer* observer) OVERRIDE {}
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {}
-  virtual bool HasObserver(Observer* observer) OVERRIDE { return false; }
+  virtual void Init(dbus::Bus* bus) override {}
+  virtual void AddObserver(Observer* observer) override {}
+  virtual void RemoveObserver(Observer* observer) override {}
+  virtual bool HasObserver(Observer* observer) override { return false; }
 
   virtual void RequestUpdateCheck(
-      const UpdateCheckCallback& callback) OVERRIDE {
+      const UpdateCheckCallback& callback) override {
     callback.Run(UPDATE_RESULT_NOTIMPLEMENTED);
   }
-  virtual void RebootAfterUpdate() OVERRIDE {}
-  virtual void Rollback() OVERRIDE {}
+  virtual void RebootAfterUpdate() override {}
+  virtual void Rollback() override {}
   virtual void CanRollbackCheck(
-      const RollbackCheckCallback& callback) OVERRIDE {
+      const RollbackCheckCallback& callback) override {
     callback.Run(true);
   }
-  virtual Status GetLastStatus() OVERRIDE { return Status(); }
+  virtual Status GetLastStatus() override { return Status(); }
   virtual void SetChannel(const std::string& target_channel,
-                          bool is_powerwash_allowed) OVERRIDE {
+                          bool is_powerwash_allowed) override {
     VLOG(1) << "Requesting to set channel: "
             << "target_channel=" << target_channel << ", "
             << "is_powerwash_allowed=" << is_powerwash_allowed;
     target_channel_ = target_channel;
   }
   virtual void GetChannel(bool get_current_channel,
-                          const GetChannelCallback& callback) OVERRIDE {
+                          const GetChannelCallback& callback) override {
     VLOG(1) << "Requesting to get channel, get_current_channel="
             << get_current_channel;
     if (get_current_channel)
@@ -450,22 +450,22 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl {
   }
 
   // UpdateEngineClient implementation:
-  virtual void AddObserver(Observer* observer) OVERRIDE {
+  virtual void AddObserver(Observer* observer) override {
     if (observer)
       observers_.AddObserver(observer);
   }
 
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {
+  virtual void RemoveObserver(Observer* observer) override {
     if (observer)
       observers_.RemoveObserver(observer);
   }
 
-  virtual bool HasObserver(Observer* observer) OVERRIDE {
+  virtual bool HasObserver(Observer* observer) override {
     return observers_.HasObserver(observer);
   }
 
   virtual void RequestUpdateCheck(
-      const UpdateCheckCallback& callback) OVERRIDE {
+      const UpdateCheckCallback& callback) override {
     if (last_status_.status != UPDATE_STATUS_IDLE) {
       callback.Run(UPDATE_RESULT_FAILED);
       return;
@@ -482,7 +482,7 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl {
         base::TimeDelta::FromMilliseconds(kStateTransitionDefaultDelayMs));
   }
 
-  virtual Status GetLastStatus() OVERRIDE { return last_status_; }
+  virtual Status GetLastStatus() override { return last_status_; }
 
  private:
   void StateTransition() {