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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/test/test_simple_task_runner.h" 10 #include "base/test/test_simple_task_runner.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 void ResetCounters() { 44 void ResetCounters() {
45 num_present_changed_ = 0; 45 num_present_changed_ = 0;
46 num_powered_changed_ = 0; 46 num_powered_changed_ = 0;
47 num_discovering_changed_ = 0; 47 num_discovering_changed_ = 0;
48 num_device_added_ = 0; 48 num_device_added_ = 0;
49 num_device_removed_ = 0; 49 num_device_removed_ = 0;
50 num_device_changed_ = 0; 50 num_device_changed_ = 0;
51 } 51 }
52 52
53 virtual void AdapterPresentChanged( 53 void AdapterPresentChanged(device::BluetoothAdapter* adapter,
54 device::BluetoothAdapter* adapter, bool present) override { 54 bool present) override {
55 num_present_changed_++; 55 num_present_changed_++;
56 } 56 }
57 57
58 virtual void AdapterPoweredChanged( 58 void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
59 device::BluetoothAdapter* adapter, bool powered) override { 59 bool powered) override {
60 num_powered_changed_++; 60 num_powered_changed_++;
61 } 61 }
62 62
63 virtual void AdapterDiscoveringChanged( 63 void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
64 device::BluetoothAdapter* adapter, bool discovering) override { 64 bool discovering) override {
65 num_discovering_changed_++; 65 num_discovering_changed_++;
66 } 66 }
67 67
68 virtual void DeviceAdded( 68 void DeviceAdded(device::BluetoothAdapter* adapter,
69 device::BluetoothAdapter* adapter, 69 device::BluetoothDevice* device) override {
70 device::BluetoothDevice* device) override {
71 num_device_added_++; 70 num_device_added_++;
72 } 71 }
73 72
74 virtual void DeviceRemoved(device::BluetoothAdapter* adapter, 73 void DeviceRemoved(device::BluetoothAdapter* adapter,
75 device::BluetoothDevice* device) override { 74 device::BluetoothDevice* device) override {
76 num_device_removed_++; 75 num_device_removed_++;
77 } 76 }
78 77
79 virtual void DeviceChanged(device::BluetoothAdapter* adapter, 78 void DeviceChanged(device::BluetoothAdapter* adapter,
80 device::BluetoothDevice* device) override { 79 device::BluetoothDevice* device) override {
81 num_device_changed_++; 80 num_device_changed_++;
82 } 81 }
83 82
84 int num_present_changed() const { return num_present_changed_; } 83 int num_present_changed() const { return num_present_changed_; }
85 84
86 int num_powered_changed() const { return num_powered_changed_; } 85 int num_powered_changed() const { return num_powered_changed_; }
87 86
88 int num_discovering_changed() const { return num_discovering_changed_; } 87 int num_discovering_changed() const { return num_discovering_changed_; }
89 88
90 int num_device_added() const { return num_device_added_; } 89 int num_device_added() const { return num_device_added_; }
(...skipping 21 matching lines...) Expand all
112 : ui_task_runner_(new base::TestSimpleTaskRunner()), 111 : ui_task_runner_(new base::TestSimpleTaskRunner()),
113 bluetooth_task_runner_(new base::TestSimpleTaskRunner()), 112 bluetooth_task_runner_(new base::TestSimpleTaskRunner()),
114 adapter_(new BluetoothAdapterWin( 113 adapter_(new BluetoothAdapterWin(
115 base::Bind(&BluetoothAdapterWinTest::RunInitCallback, 114 base::Bind(&BluetoothAdapterWinTest::RunInitCallback,
116 base::Unretained(this)))), 115 base::Unretained(this)))),
117 adapter_win_(static_cast<BluetoothAdapterWin*>(adapter_.get())), 116 adapter_win_(static_cast<BluetoothAdapterWin*>(adapter_.get())),
118 init_callback_called_(false) { 117 init_callback_called_(false) {
119 adapter_win_->InitForTest(ui_task_runner_, bluetooth_task_runner_); 118 adapter_win_->InitForTest(ui_task_runner_, bluetooth_task_runner_);
120 } 119 }
121 120
122 virtual void SetUp() override { 121 void SetUp() override {
123 adapter_win_->AddObserver(&adapter_observer_); 122 adapter_win_->AddObserver(&adapter_observer_);
124 num_start_discovery_callbacks_ = 0; 123 num_start_discovery_callbacks_ = 0;
125 num_start_discovery_error_callbacks_ = 0; 124 num_start_discovery_error_callbacks_ = 0;
126 num_stop_discovery_callbacks_ = 0; 125 num_stop_discovery_callbacks_ = 0;
127 num_stop_discovery_error_callbacks_ = 0; 126 num_stop_discovery_error_callbacks_ = 0;
128 } 127 }
129 128
130 virtual void TearDown() override { 129 void TearDown() override { adapter_win_->RemoveObserver(&adapter_observer_); }
131 adapter_win_->RemoveObserver(&adapter_observer_);
132 }
133 130
134 void RunInitCallback() { 131 void RunInitCallback() {
135 init_callback_called_ = true; 132 init_callback_called_ = true;
136 } 133 }
137 134
138 void IncrementNumStartDiscoveryCallbacks() { 135 void IncrementNumStartDiscoveryCallbacks() {
139 num_start_discovery_callbacks_++; 136 num_start_discovery_callbacks_++;
140 } 137 }
141 138
142 void IncrementNumStartDiscoveryErrorCallbacks() { 139 void IncrementNumStartDiscoveryErrorCallbacks() {
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 // Remove a service 573 // Remove a service
577 laptop_state->service_record_states.clear(); 574 laptop_state->service_record_states.clear();
578 adapter_observer_.ResetCounters(); 575 adapter_observer_.ResetCounters();
579 adapter_win_->DevicesPolled(devices); 576 adapter_win_->DevicesPolled(devices);
580 EXPECT_EQ(0, adapter_observer_.num_device_added()); 577 EXPECT_EQ(0, adapter_observer_.num_device_added());
581 EXPECT_EQ(0, adapter_observer_.num_device_removed()); 578 EXPECT_EQ(0, adapter_observer_.num_device_removed());
582 EXPECT_EQ(1, adapter_observer_.num_device_changed()); 579 EXPECT_EQ(1, adapter_observer_.num_device_changed());
583 } 580 }
584 581
585 } // namespace device 582 } // namespace device
OLDNEW
« 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