Update {virtual,override} to follow C++11 style in components.

The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.

This patch was manually generated using a regex and a text editor.

BUG=417463

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

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

6 files changed, 20 insertions, 23 deletions

diff --git a/components/storage_monitor/storage_monitor_win.h b/components/storage_monitor/storage_monitor_win.h
index 6b51cab..2a99f12 100644
--- a/components/storage_monitor/storage_monitor_win.h
+++ b/components/storage_monitor/storage_monitor_win.h
@@ -29,20 +29,20 @@ class StorageMonitorWin : public StorageMonitor {
   // unit tests or in StorageMonitorWin CreateInternal() function.
   StorageMonitorWin(VolumeMountWatcherWin* volume_mount_watcher,
                     PortableDeviceWatcherWin* portable_device_watcher);
-  virtual ~StorageMonitorWin();
+  ~StorageMonitorWin() override;
 
   // Must be called after the file thread is created.
-  virtual void Init() override;
+  void Init() override;
 
   // StorageMonitor:
-  virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const override;
-  virtual bool GetMTPStorageInfoFromDeviceId(
+  bool GetStorageInfoForPath(const base::FilePath& path,
+                             StorageInfo* device_info) const override;
+  bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const override;
 
-  virtual void EjectDevice(
+  void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) override;
 
diff --git a/components/storage_monitor/storage_monitor_win_unittest.cc b/components/storage_monitor/storage_monitor_win_unittest.cc
index fd7ee58..1db435f 100644
--- a/components/storage_monitor/storage_monitor_win_unittest.cc
+++ b/components/storage_monitor/storage_monitor_win_unittest.cc
@@ -39,12 +39,12 @@ namespace storage_monitor {
 class StorageMonitorWinTest : public testing::Test {
  public:
   StorageMonitorWinTest();
-  virtual ~StorageMonitorWinTest();
+  ~StorageMonitorWinTest() override;
 
  protected:
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   void PreAttachDevices();
 
diff --git a/components/storage_monitor/test_portable_device_watcher_win.h b/components/storage_monitor/test_portable_device_watcher_win.h
index bc108b1..53275da 100644
--- a/components/storage_monitor/test_portable_device_watcher_win.h
+++ b/components/storage_monitor/test_portable_device_watcher_win.h
@@ -26,7 +26,7 @@ class TestPortableDeviceWatcherWin : public PortableDeviceWatcherWin {
   static const char kStorageUniqueIdA[];
 
   TestPortableDeviceWatcherWin();
-  virtual ~TestPortableDeviceWatcherWin();
+  ~TestPortableDeviceWatcherWin() override;
 
   // Returns the persistent storage unique id of the device specified by the
   // |pnp_device_id|. |storage_object_id| specifies the string ID that uniquely
@@ -60,10 +60,9 @@ class TestPortableDeviceWatcherWin : public PortableDeviceWatcherWin {
 
  private:
   // PortableDeviceWatcherWin:
-  virtual void EnumerateAttachedDevices() override;
-  virtual void HandleDeviceAttachEvent(
-      const base::string16& pnp_device_id) override;
-  virtual bool GetMTPStorageInfoFromDeviceId(
+  void EnumerateAttachedDevices() override;
+  void HandleDeviceAttachEvent(const base::string16& pnp_device_id) override;
+  bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const override;
diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h
index 7eff7fb..7726e57 100644
--- a/components/storage_monitor/test_storage_monitor.h
+++ b/components/storage_monitor/test_storage_monitor.h
@@ -38,7 +38,7 @@ class TestStorageMonitor : public StorageMonitor {
                              StorageInfo* device_info) const override;
 
 #if defined(OS_WIN)
-  virtual bool GetMTPStorageInfoFromDeviceId(
+  bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const override;
diff --git a/components/storage_monitor/test_storage_monitor_win.h b/components/storage_monitor/test_storage_monitor_win.h
index 60660ae..2ffd070 100644
--- a/components/storage_monitor/test_storage_monitor_win.h
+++ b/components/storage_monitor/test_storage_monitor_win.h
@@ -24,13 +24,13 @@ class TestStorageMonitorWin: public StorageMonitorWin {
       TestVolumeMountWatcherWin* volume_mount_watcher,
       TestPortableDeviceWatcherWin* portable_device_watcher);
 
-  virtual ~TestStorageMonitorWin();
+  ~TestStorageMonitorWin() override;
 
   void InjectDeviceChange(UINT event_type, DWORD data);
 
   VolumeMountWatcherWin* volume_mount_watcher();
 
-  virtual Receiver* receiver() const override;
+  Receiver* receiver() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestStorageMonitorWin);
diff --git a/components/storage_monitor/test_volume_mount_watcher_win.h b/components/storage_monitor/test_volume_mount_watcher_win.h
index 5191997..ca0a9b4 100644
--- a/components/storage_monitor/test_volume_mount_watcher_win.h
+++ b/components/storage_monitor/test_volume_mount_watcher_win.h
@@ -24,7 +24,7 @@ namespace storage_monitor {
 class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
  public:
   TestVolumeMountWatcherWin();
-  virtual ~TestVolumeMountWatcherWin();
+  ~TestVolumeMountWatcherWin() override;
 
   static bool GetDeviceRemovable(const base::FilePath& device_path,
                                  bool* removable);
@@ -47,11 +47,9 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
   void ReleaseDeviceCheck();
 
   // VolumeMountWatcherWin:
-  virtual void DeviceCheckComplete(const base::FilePath& device_path) override;
-  virtual GetAttachedDevicesCallbackType
-      GetAttachedDevicesCallback() const override;
-  virtual GetDeviceDetailsCallbackType
-      GetDeviceDetailsCallback() const override;
+  void DeviceCheckComplete(const base::FilePath& device_path) override;
+  GetAttachedDevicesCallbackType GetAttachedDevicesCallback() const override;
+  GetDeviceDetailsCallbackType GetDeviceDetailsCallback() const override;
 
  private:
   std::vector<base::FilePath> devices_checked_;