Standardize usage of virtual/override/final in chrome/browser/devtools/

chrome/browser/devtools/device/usb/android_usb_browsertest.cc

 // Copyright 2014 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 <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/device/usb/android_usb_device.h"
 #include "chrome/browser/devtools/device/usb/usb_device_provider.h"
@@ skipping 395 matching lines @@
  private:
   UsbConfigDescriptor config_desc_;
 };
 
 class MockUsbService : public UsbService {
  public:
   MockUsbService() {
     devices_.push_back(new MockUsbDevice<AndroidTraits>());
   }
 
-  virtual ~MockUsbService() {}
+  ~MockUsbService() override {}
 
-  virtual scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) override {
+  scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) override {
     NOTIMPLEMENTED();
     return NULL;
   }
 
-  virtual void GetDevices(
-      std::vector<scoped_refptr<UsbDevice> >* devices) override {
+  void GetDevices(std::vector<scoped_refptr<UsbDevice>>* devices) override {
     STLClearObject(devices);
     std::copy(devices_.begin(), devices_.end(), back_inserter(*devices));
   }
 
   std::vector<scoped_refptr<UsbDevice> > devices_;
 };
 
 class MockUsbServiceForCheckingTraits : public UsbService {
  public:
   MockUsbServiceForCheckingTraits() : step_(0) {}
 
-  virtual ~MockUsbServiceForCheckingTraits() {}
+  ~MockUsbServiceForCheckingTraits() override {}
 
-  virtual scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) override {
+  scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) override {
     NOTIMPLEMENTED();
     return NULL;
   }
 
-  virtual void GetDevices(
-      std::vector<scoped_refptr<UsbDevice> >* devices) override {
+  void GetDevices(std::vector<scoped_refptr<UsbDevice>>* devices) override {
     STLClearObject(devices);
     // This switch should be kept in sync with
     // AndroidUsbBrowserTest::DeviceCountChanged.
     switch (step_) {
       case 0:
         // No devices.
         break;
       case 1:
         // Android device.
         devices->push_back(new MockUsbDevice<AndroidTraits>());
@@ skipping 15 matching lines @@
   int step_;
 };
 
 class DevToolsAndroidBridgeWarmUp
     : public DevToolsAndroidBridge::DeviceCountListener {
  public:
   DevToolsAndroidBridgeWarmUp(base::Closure closure,
                               scoped_refptr<DevToolsAndroidBridge> adb_bridge)
       : closure_(closure), adb_bridge_(adb_bridge) {}
 
-  virtual void DeviceCountChanged(int count) override {
+  void DeviceCountChanged(int count) override {
     adb_bridge_->RemoveDeviceCountListener(this);
     closure_.Run();
   }
 
   base::Closure closure_;
   scoped_refptr<DevToolsAndroidBridge> adb_bridge_;
 };
 
 class AndroidUsbDiscoveryTest : public InProcessBrowserTest {
  protected:
   AndroidUsbDiscoveryTest()
       : scheduler_invoked_(0) {
   }
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
 
     BrowserThread::PostTaskAndReply(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&AndroidUsbDiscoveryTest::SetUpService, this),
         runner->QuitClosure());
     runner->Run();
 
@@ skipping 15 matching lines @@
   void ScheduleDeviceCountRequest(const base::Closure& request) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     scheduler_invoked_++;
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, request);
   }
 
   virtual void SetUpService() {
     UsbService::SetInstanceForTest(new MockUsbService());
   }
 
-  virtual void TearDownOnMainThread() override {
+  void TearDownOnMainThread() override {
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     UsbService* service = NULL;
     BrowserThread::PostTaskAndReply(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UsbService::SetInstanceForTest, service),
         runner->QuitClosure());
     runner->Run();
   }
 
   scoped_refptr<content::MessageLoopRunner> runner_;
   scoped_refptr<DevToolsAndroidBridge> adb_bridge_;
   int scheduler_invoked_;
 };
 
 class AndroidUsbCountTest : public AndroidUsbDiscoveryTest {
  protected:
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     AndroidUsbDiscoveryTest::SetUpOnMainThread();
     DevToolsAndroidBridgeWarmUp warmup(runner_->QuitClosure(), adb_bridge_);
     adb_bridge_->AddDeviceCountListener(&warmup);
     runner_->Run();
     runner_ = new content::MessageLoopRunner;
   }
 };
 
 class AndroidUsbTraitsTest : public AndroidUsbDiscoveryTest {
  protected:
-  virtual void SetUpService() override {
+  void SetUpService() override {
     UsbService::SetInstanceForTest(new MockUsbServiceForCheckingTraits());
   }
 };
 
 class MockListListener : public DevToolsAndroidBridge::DeviceListListener {
  public:
   MockListListener(scoped_refptr<DevToolsAndroidBridge> adb_bridge,
                    const base::Closure& callback)
       : adb_bridge_(adb_bridge),
         callback_(callback) {
   }
 
-  virtual void DeviceListChanged(
+  void DeviceListChanged(
       const DevToolsAndroidBridge::RemoteDevices& devices) override {
     if (devices.size() > 0) {
       if (devices[0]->is_connected()) {
         ASSERT_EQ(kDeviceModel, devices[0]->model());
         ASSERT_EQ(kDeviceSerial, devices[0]->serial());
         adb_bridge_->RemoveDeviceListListener(this);
         callback_.Run();
       }
     }
   }
 
   scoped_refptr<DevToolsAndroidBridge> adb_bridge_;
   base::Closure callback_;
 };
 
 class MockCountListener : public DevToolsAndroidBridge::DeviceCountListener {
  public:
   explicit MockCountListener(scoped_refptr<DevToolsAndroidBridge> adb_bridge)
       : adb_bridge_(adb_bridge),
         reposts_left_(10),
         invoked_(0) {
   }
 
-  virtual void DeviceCountChanged(int count) override {
+  void DeviceCountChanged(int count) override {
     ++invoked_;
     adb_bridge_->RemoveDeviceCountListener(this);
     Shutdown();
   }
 
   void Shutdown() {
     ShutdownOnUIThread();
   };
 
   void ShutdownOnUIThread() {
@@ skipping 23 matching lines @@
 };
 
 class MockCountListenerWithReAdd : public MockCountListener {
  public:
   explicit MockCountListenerWithReAdd(
       scoped_refptr<DevToolsAndroidBridge> adb_bridge)
       : MockCountListener(adb_bridge),
         readd_count_(2) {
   }
 
-  virtual void DeviceCountChanged(int count) override {
+  void DeviceCountChanged(int count) override {
     ++invoked_;
     adb_bridge_->RemoveDeviceCountListener(this);
     if (readd_count_ > 0) {
       readd_count_--;
       adb_bridge_->AddDeviceCountListener(this);
       adb_bridge_->RemoveDeviceCountListener(this);
       adb_bridge_->AddDeviceCountListener(this);
     } else {
       Shutdown();
     }
   }
 
   int readd_count_;
 };
 
 class MockCountListenerWithReAddWhileQueued : public MockCountListener {
  public:
   MockCountListenerWithReAddWhileQueued(
       scoped_refptr<DevToolsAndroidBridge> adb_bridge)
       : MockCountListener(adb_bridge),
         readded_(false) {
   }
 
-  virtual void DeviceCountChanged(int count) override {
+  void DeviceCountChanged(int count) override {
     ++invoked_;
     if (!readded_) {
       readded_ = true;
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(&MockCountListenerWithReAddWhileQueued::ReAdd,
                      base::Unretained(this)));
     } else {
       adb_bridge_->RemoveDeviceCountListener(this);
       Shutdown();
     }
   }
 
   void ReAdd() {
     adb_bridge_->RemoveDeviceCountListener(this);
     adb_bridge_->AddDeviceCountListener(this);
   }
 
   bool readded_;
 };
 
 class MockCountListenerForCheckingTraits : public MockCountListener {
  public:
   MockCountListenerForCheckingTraits(
       scoped_refptr<DevToolsAndroidBridge> adb_bridge)
       : MockCountListener(adb_bridge),
         step_(0) {
   }
-  virtual void DeviceCountChanged(int count) override {
+  void DeviceCountChanged(int count) override {
     switch (step_) {
       case 0:
         // Check for 0 devices when no devices present.
         EXPECT_EQ(0, count);
         break;
       case 1:
         // Check for 1 device when only android device present.
         EXPECT_EQ(1, count);
         break;
       case 2:
@@ skipping 59 matching lines @@
   runner_->Run();
   EXPECT_EQ(2, listener.invoked_);
   EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_);
 }
 
 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) {
   MockCountListenerForCheckingTraits listener(adb_bridge_);
   adb_bridge_->AddDeviceCountListener(&listener);
   runner_->Run();
 }