Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Unified Diff: device/bluetooth/bluetooth_adapter_win_unittest.cc

Issue 1107433002: Update {virtual,override} to follow C++11 style in device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync and git cl format Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_adapter_win.h ('k') | device/bluetooth/bluetooth_device_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_win_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc
index 670a03dc2faefbceb7cb48d551c7c9ef5600dac5..df445f8fa98ab965568bf87018efaa839e9ecb80 100644
--- a/device/bluetooth/bluetooth_adapter_win_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_win_unittest.cc
@@ -50,34 +50,33 @@ class AdapterObserver : public device::BluetoothAdapter::Observer {
num_device_changed_ = 0;
}
- virtual void AdapterPresentChanged(
- device::BluetoothAdapter* adapter, bool present) override {
+ void AdapterPresentChanged(device::BluetoothAdapter* adapter,
+ bool present) override {
num_present_changed_++;
}
- virtual void AdapterPoweredChanged(
- device::BluetoothAdapter* adapter, bool powered) override {
+ void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
+ bool powered) override {
num_powered_changed_++;
}
- virtual void AdapterDiscoveringChanged(
- device::BluetoothAdapter* adapter, bool discovering) override {
+ void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
+ bool discovering) override {
num_discovering_changed_++;
}
- virtual void DeviceAdded(
- device::BluetoothAdapter* adapter,
- device::BluetoothDevice* device) override {
+ void DeviceAdded(device::BluetoothAdapter* adapter,
+ device::BluetoothDevice* device) override {
num_device_added_++;
}
- virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
- device::BluetoothDevice* device) override {
+ void DeviceRemoved(device::BluetoothAdapter* adapter,
+ device::BluetoothDevice* device) override {
num_device_removed_++;
}
- virtual void DeviceChanged(device::BluetoothAdapter* adapter,
- device::BluetoothDevice* device) override {
+ void DeviceChanged(device::BluetoothAdapter* adapter,
+ device::BluetoothDevice* device) override {
num_device_changed_++;
}
@@ -119,7 +118,7 @@ class BluetoothAdapterWinTest : public testing::Test {
adapter_win_->InitForTest(ui_task_runner_, bluetooth_task_runner_);
}
- virtual void SetUp() override {
+ void SetUp() override {
adapter_win_->AddObserver(&adapter_observer_);
num_start_discovery_callbacks_ = 0;
num_start_discovery_error_callbacks_ = 0;
@@ -127,9 +126,7 @@ class BluetoothAdapterWinTest : public testing::Test {
num_stop_discovery_error_callbacks_ = 0;
}
- virtual void TearDown() override {
- adapter_win_->RemoveObserver(&adapter_observer_);
- }
+ void TearDown() override { adapter_win_->RemoveObserver(&adapter_observer_); }
void RunInitCallback() {
init_callback_called_ = true;
« no previous file with comments | « device/bluetooth/bluetooth_adapter_win.h ('k') | device/bluetooth/bluetooth_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698