summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-30 22:17:32 +0000
committerkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-30 22:17:32 +0000
commit616b701515db7fea8e86cf01688b8840238ecdad (patch)
treea6cd1f127dc6961ebc825133faad4d2f26ddf7a9 /device
parent9badb4e5b7512e9f18d07e252bfa43c3b26653b4 (diff)
downloadchromium_src-616b701515db7fea8e86cf01688b8840238ecdad.zip
chromium_src-616b701515db7fea8e86cf01688b8840238ecdad.tar.gz
chromium_src-616b701515db7fea8e86cf01688b8840238ecdad.tar.bz2
Bluetooth: change capitilization of ChromeOs to ChromeOS
BUG=none TEST=device_unittests Review URL: https://codereview.chromium.org/12088064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/bluetooth_adapter_chromeos.cc104
-rw-r--r--device/bluetooth/bluetooth_adapter_chromeos.h16
-rw-r--r--device/bluetooth/bluetooth_adapter_chromeos_unittest.cc330
-rw-r--r--device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc18
-rw-r--r--device/bluetooth/bluetooth_adapter_factory.cc8
-rw-r--r--device/bluetooth/bluetooth_device_chromeos.cc146
-rw-r--r--device/bluetooth/bluetooth_device_chromeos.h22
-rw-r--r--device/bluetooth/bluetooth_socket_chromeos.cc20
-rw-r--r--device/bluetooth/bluetooth_socket_chromeos.h8
9 files changed, 336 insertions, 336 deletions
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.cc b/device/bluetooth/bluetooth_adapter_chromeos.cc
index e15598a..efd97a89 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.cc
+++ b/device/bluetooth/bluetooth_adapter_chromeos.cc
@@ -25,7 +25,7 @@ using device::BluetoothOutOfBandPairingData;
namespace chromeos {
-BluetoothAdapterChromeOs::BluetoothAdapterChromeOs() : BluetoothAdapter(),
+BluetoothAdapterChromeOS::BluetoothAdapterChromeOS() : BluetoothAdapter(),
track_default_(false),
powered_(false),
scanning_(false),
@@ -39,7 +39,7 @@ BluetoothAdapterChromeOs::BluetoothAdapterChromeOs() : BluetoothAdapter(),
AddObserver(this);
}
-BluetoothAdapterChromeOs::~BluetoothAdapterChromeOs() {
+BluetoothAdapterChromeOS::~BluetoothAdapterChromeOS() {
DBusThreadManager::Get()->GetBluetoothDeviceClient()->
RemoveObserver(this);
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
@@ -50,13 +50,13 @@ BluetoothAdapterChromeOs::~BluetoothAdapterChromeOs() {
STLDeleteValues(&devices_);
}
-void BluetoothAdapterChromeOs::AddObserver(
+void BluetoothAdapterChromeOS::AddObserver(
BluetoothAdapter::Observer* observer) {
DCHECK(observer);
observers_.AddObserver(observer);
}
-void BluetoothAdapterChromeOs::RemoveObserver(
+void BluetoothAdapterChromeOS::RemoveObserver(
BluetoothAdapter::Observer* observer) {
DCHECK(observer);
observers_.RemoveObserver(observer);
@@ -64,39 +64,39 @@ void BluetoothAdapterChromeOs::RemoveObserver(
// TODO(youngki) Return true when object path and properties of the adapter are
// initialized.
-bool BluetoothAdapterChromeOs::IsInitialized() const {
+bool BluetoothAdapterChromeOS::IsInitialized() const {
return true;
}
-bool BluetoothAdapterChromeOs::IsPresent() const {
+bool BluetoothAdapterChromeOS::IsPresent() const {
return !object_path_.value().empty() && !address_.empty();
}
-bool BluetoothAdapterChromeOs::IsPowered() const {
+bool BluetoothAdapterChromeOS::IsPowered() const {
return powered_;
}
-void BluetoothAdapterChromeOs::SetPowered(bool powered,
+void BluetoothAdapterChromeOS::SetPowered(bool powered,
const base::Closure& callback,
const ErrorCallback& error_callback) {
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
GetProperties(object_path_)->powered.Set(
powered,
- base::Bind(&BluetoothAdapterChromeOs::OnSetPowered,
+ base::Bind(&BluetoothAdapterChromeOS::OnSetPowered,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-bool BluetoothAdapterChromeOs::IsDiscovering() const {
+bool BluetoothAdapterChromeOS::IsDiscovering() const {
return discovering_count_ > 0;
}
-bool BluetoothAdapterChromeOs::IsScanning() const {
+bool BluetoothAdapterChromeOS::IsScanning() const {
return scanning_;
}
-void BluetoothAdapterChromeOs::StartDiscovering(
+void BluetoothAdapterChromeOS::StartDiscovering(
const base::Closure& callback,
const ErrorCallback& error_callback) {
// BlueZ counts discovery sessions, and permits multiple sessions for a
@@ -105,52 +105,52 @@ void BluetoothAdapterChromeOs::StartDiscovering(
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
StartDiscovery(object_path_,
base::Bind(
- &BluetoothAdapterChromeOs::OnStartDiscovery,
+ &BluetoothAdapterChromeOS::OnStartDiscovery,
weak_ptr_factory_.GetWeakPtr(),
callback, error_callback));
}
-void BluetoothAdapterChromeOs::StopDiscovering(
+void BluetoothAdapterChromeOS::StopDiscovering(
const base::Closure& callback,
const ErrorCallback& error_callback) {
// Inform BlueZ to stop one of our open discovery sessions.
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
StopDiscovery(object_path_,
base::Bind(
- &BluetoothAdapterChromeOs::OnStopDiscovery,
+ &BluetoothAdapterChromeOS::OnStopDiscovery,
weak_ptr_factory_.GetWeakPtr(),
callback, error_callback));
}
-void BluetoothAdapterChromeOs::ReadLocalOutOfBandPairingData(
+void BluetoothAdapterChromeOS::ReadLocalOutOfBandPairingData(
const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
const ErrorCallback& error_callback) {
DBusThreadManager::Get()->GetBluetoothOutOfBandClient()->
ReadLocalData(object_path_,
- base::Bind(&BluetoothAdapterChromeOs::OnReadLocalData,
+ base::Bind(&BluetoothAdapterChromeOS::OnReadLocalData,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-void BluetoothAdapterChromeOs::TrackDefaultAdapter() {
+void BluetoothAdapterChromeOS::TrackDefaultAdapter() {
DVLOG(1) << "Tracking default adapter";
track_default_ = true;
DBusThreadManager::Get()->GetBluetoothManagerClient()->
- DefaultAdapter(base::Bind(&BluetoothAdapterChromeOs::AdapterCallback,
+ DefaultAdapter(base::Bind(&BluetoothAdapterChromeOS::AdapterCallback,
weak_ptr_factory_.GetWeakPtr()));
}
-void BluetoothAdapterChromeOs::FindAdapter(const std::string& address) {
+void BluetoothAdapterChromeOS::FindAdapter(const std::string& address) {
DVLOG(1) << "Using adapter " << address;
track_default_ = false;
DBusThreadManager::Get()->GetBluetoothManagerClient()->
FindAdapter(address,
- base::Bind(&BluetoothAdapterChromeOs::AdapterCallback,
+ base::Bind(&BluetoothAdapterChromeOS::AdapterCallback,
weak_ptr_factory_.GetWeakPtr()));
}
-void BluetoothAdapterChromeOs::AdapterCallback(
+void BluetoothAdapterChromeOS::AdapterCallback(
const dbus::ObjectPath& adapter_path,
bool success) {
if (success) {
@@ -160,19 +160,19 @@ void BluetoothAdapterChromeOs::AdapterCallback(
}
}
-void BluetoothAdapterChromeOs::DefaultAdapterChanged(
+void BluetoothAdapterChromeOS::DefaultAdapterChanged(
const dbus::ObjectPath& adapter_path) {
if (track_default_)
ChangeAdapter(adapter_path);
}
-void BluetoothAdapterChromeOs::AdapterRemoved(
+void BluetoothAdapterChromeOS::AdapterRemoved(
const dbus::ObjectPath& adapter_path) {
if (adapter_path == object_path_)
RemoveAdapter();
}
-void BluetoothAdapterChromeOs::ChangeAdapter(
+void BluetoothAdapterChromeOS::ChangeAdapter(
const dbus::ObjectPath& adapter_path) {
if (object_path_.value().empty()) {
DVLOG(1) << "Adapter path initialized to " << adapter_path.value();
@@ -209,7 +209,7 @@ void BluetoothAdapterChromeOs::ChangeAdapter(
AdapterPresentChanged(this, true));
}
-void BluetoothAdapterChromeOs::RemoveAdapter() {
+void BluetoothAdapterChromeOS::RemoveAdapter() {
const bool adapter_was_present = IsPresent();
DVLOG(1) << "Adapter lost.";
@@ -226,7 +226,7 @@ void BluetoothAdapterChromeOs::RemoveAdapter() {
AdapterPresentChanged(this, false));
}
-void BluetoothAdapterChromeOs::OnSetPowered(const base::Closure& callback,
+void BluetoothAdapterChromeOS::OnSetPowered(const base::Closure& callback,
const ErrorCallback& error_callback,
bool success) {
if (success)
@@ -235,7 +235,7 @@ void BluetoothAdapterChromeOs::OnSetPowered(const base::Closure& callback,
error_callback.Run();
}
-void BluetoothAdapterChromeOs::PoweredChanged(bool powered) {
+void BluetoothAdapterChromeOS::PoweredChanged(bool powered) {
if (powered == powered_)
return;
@@ -245,7 +245,7 @@ void BluetoothAdapterChromeOs::PoweredChanged(bool powered) {
AdapterPoweredChanged(this, powered_));
}
-void BluetoothAdapterChromeOs::OnStartDiscovery(
+void BluetoothAdapterChromeOS::OnStartDiscovery(
const base::Closure& callback,
const ErrorCallback& error_callback,
const dbus::ObjectPath& adapter_path,
@@ -267,7 +267,7 @@ void BluetoothAdapterChromeOs::OnStartDiscovery(
}
}
-void BluetoothAdapterChromeOs::OnStopDiscovery(
+void BluetoothAdapterChromeOS::OnStopDiscovery(
const base::Closure& callback,
const ErrorCallback& error_callback,
const dbus::ObjectPath& adapter_path,
@@ -293,7 +293,7 @@ void BluetoothAdapterChromeOs::OnStopDiscovery(
}
}
-void BluetoothAdapterChromeOs::DiscoveringChanged(bool discovering) {
+void BluetoothAdapterChromeOS::DiscoveringChanged(bool discovering) {
// The BlueZ discovering property actually just indicates whether the
// device is in an inquiry scan, so update our scanning property.
if (discovering == scanning_)
@@ -305,7 +305,7 @@ void BluetoothAdapterChromeOs::DiscoveringChanged(bool discovering) {
AdapterScanningChanged(this, scanning_));
}
-void BluetoothAdapterChromeOs::OnReadLocalData(
+void BluetoothAdapterChromeOS::OnReadLocalData(
const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
const ErrorCallback& error_callback,
const BluetoothOutOfBandPairingData& data,
@@ -316,7 +316,7 @@ void BluetoothAdapterChromeOs::OnReadLocalData(
error_callback.Run();
}
-void BluetoothAdapterChromeOs::AdapterPropertyChanged(
+void BluetoothAdapterChromeOS::AdapterPropertyChanged(
const dbus::ObjectPath& adapter_path,
const std::string& property_name) {
if (adapter_path != object_path_)
@@ -346,13 +346,13 @@ void BluetoothAdapterChromeOs::AdapterPropertyChanged(
}
}
-void BluetoothAdapterChromeOs::DevicePropertyChanged(
+void BluetoothAdapterChromeOS::DevicePropertyChanged(
const dbus::ObjectPath& device_path,
const std::string& property_name) {
UpdateDevice(device_path);
}
-void BluetoothAdapterChromeOs::UpdateDevice(
+void BluetoothAdapterChromeOS::UpdateDevice(
const dbus::ObjectPath& device_path) {
BluetoothDeviceClient::Properties* properties =
DBusThreadManager::Get()->GetBluetoothDeviceClient()->
@@ -369,12 +369,12 @@ void BluetoothAdapterChromeOs::UpdateDevice(
// pairing gaining an object path in the process. In any case, we want
// to update the existing object, not create a new one.
DevicesMap::iterator iter = devices_.find(address);
- BluetoothDeviceChromeOs* device;
+ BluetoothDeviceChromeOS* device;
const bool update_device = (iter != devices_.end());
if (update_device) {
- device = static_cast<BluetoothDeviceChromeOs*>(iter->second);
+ device = static_cast<BluetoothDeviceChromeOS*>(iter->second);
} else {
- device = BluetoothDeviceChromeOs::Create(this);
+ device = BluetoothDeviceChromeOS::Create(this);
devices_[address] = device;
}
@@ -395,7 +395,7 @@ void BluetoothAdapterChromeOs::UpdateDevice(
}
}
-void BluetoothAdapterChromeOs::ClearDevices() {
+void BluetoothAdapterChromeOS::ClearDevices() {
DevicesMap replace;
devices_.swap(replace);
for (DevicesMap::iterator iter = replace.begin();
@@ -408,7 +408,7 @@ void BluetoothAdapterChromeOs::ClearDevices() {
}
}
-void BluetoothAdapterChromeOs::DeviceCreated(
+void BluetoothAdapterChromeOS::DeviceCreated(
const dbus::ObjectPath& adapter_path,
const dbus::ObjectPath& device_path) {
if (adapter_path != object_path_)
@@ -417,7 +417,7 @@ void BluetoothAdapterChromeOs::DeviceCreated(
UpdateDevice(device_path);
}
-void BluetoothAdapterChromeOs::DeviceRemoved(
+void BluetoothAdapterChromeOS::DeviceRemoved(
const dbus::ObjectPath& adapter_path,
const dbus::ObjectPath& device_path) {
if (adapter_path != object_path_)
@@ -425,8 +425,8 @@ void BluetoothAdapterChromeOs::DeviceRemoved(
DevicesMap::iterator iter = devices_.begin();
while (iter != devices_.end()) {
- BluetoothDeviceChromeOs* device =
- static_cast<BluetoothDeviceChromeOs*>(iter->second);
+ BluetoothDeviceChromeOS* device =
+ static_cast<BluetoothDeviceChromeOS*>(iter->second);
DevicesMap::iterator temp = iter;
++iter;
@@ -454,14 +454,14 @@ void BluetoothAdapterChromeOs::DeviceRemoved(
}
}
-void BluetoothAdapterChromeOs::DevicesChanged(
+void BluetoothAdapterChromeOS::DevicesChanged(
const std::vector<dbus::ObjectPath>& devices) {
for (std::vector<dbus::ObjectPath>::const_iterator iter =
devices.begin(); iter != devices.end(); ++iter)
UpdateDevice(*iter);
}
-void BluetoothAdapterChromeOs::ClearDiscoveredDevices() {
+void BluetoothAdapterChromeOS::ClearDiscoveredDevices() {
DevicesMap::iterator iter = devices_.begin();
while (iter != devices_.end()) {
BluetoothDevice* device = iter->second;
@@ -478,7 +478,7 @@ void BluetoothAdapterChromeOs::ClearDiscoveredDevices() {
}
}
-void BluetoothAdapterChromeOs::DeviceFound(
+void BluetoothAdapterChromeOS::DeviceFound(
const dbus::ObjectPath& adapter_path,
const std::string& address,
const BluetoothDeviceClient::Properties& properties) {
@@ -488,13 +488,13 @@ void BluetoothAdapterChromeOs::DeviceFound(
// DeviceFound can also be called to indicate that a device we've
// paired with is now visible to the adapter during discovery, in which
// case we want to update the existing object, not create a new one.
- BluetoothDeviceChromeOs* device;
+ BluetoothDeviceChromeOS* device;
DevicesMap::iterator iter = devices_.find(address);
const bool update_device = (iter != devices_.end());
if (update_device) {
- device = static_cast<BluetoothDeviceChromeOs*>(iter->second);
+ device = static_cast<BluetoothDeviceChromeOS*>(iter->second);
} else {
- device = BluetoothDeviceChromeOs::Create(this);
+ device = BluetoothDeviceChromeOS::Create(this);
devices_[address] = device;
}
@@ -511,7 +511,7 @@ void BluetoothAdapterChromeOs::DeviceFound(
}
}
-void BluetoothAdapterChromeOs::DeviceDisappeared(
+void BluetoothAdapterChromeOS::DeviceDisappeared(
const dbus::ObjectPath& adapter_path,
const std::string& address) {
if (adapter_path != object_path_)
@@ -521,8 +521,8 @@ void BluetoothAdapterChromeOs::DeviceDisappeared(
if (iter == devices_.end())
return;
- BluetoothDeviceChromeOs* device =
- static_cast<BluetoothDeviceChromeOs*>(iter->second);
+ BluetoothDeviceChromeOS* device =
+ static_cast<BluetoothDeviceChromeOS*>(iter->second);
// DeviceDisappeared can also be called to indicate that a device we've
// paired with is no longer visible to the adapter, so don't remove
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.h b/device/bluetooth/bluetooth_adapter_chromeos.h
index 61adcd9..7806b21 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.h
+++ b/device/bluetooth/bluetooth_adapter_chromeos.h
@@ -27,11 +27,11 @@ struct BluetoothOutOfBandPairingData;
namespace chromeos {
-class BluetoothDeviceChromeOs;
+class BluetoothDeviceChromeOS;
-// The BluetoothAdapterChromeOs class is an implementation of BluetoothAdapter
+// The BluetoothAdapterChromeOS class is an implementation of BluetoothAdapter
// for Chrome OS platform.
-class BluetoothAdapterChromeOs
+class BluetoothAdapterChromeOS
: public device::BluetoothAdapter,
public BluetoothManagerClient::Observer,
public BluetoothAdapterClient::Observer,
@@ -63,12 +63,12 @@ class BluetoothAdapterChromeOs
const ErrorCallback& error_callback) OVERRIDE;
private:
- friend class BluetoothDeviceChromeOs;
+ friend class BluetoothDeviceChromeOS;
friend class device::BluetoothAdapterFactory;
friend class device::MockBluetoothAdapter;
- BluetoothAdapterChromeOs();
- virtual ~BluetoothAdapterChromeOs();
+ BluetoothAdapterChromeOS();
+ virtual ~BluetoothAdapterChromeOS();
// Obtains the default adapter object path from the Bluetooth Daemon
// and tracks future changes to it.
@@ -234,9 +234,9 @@ class BluetoothAdapterChromeOs
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
- base::WeakPtrFactory<BluetoothAdapterChromeOs> weak_ptr_factory_;
+ base::WeakPtrFactory<BluetoothAdapterChromeOS> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOs);
+ DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOS);
};
} // namespace chromeos
diff --git a/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
index 30cac19..517a27e 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
@@ -22,7 +22,7 @@ using ::testing::SaveArg;
namespace chromeos {
-class BluetoothAdapterChromeOsTest : public testing::Test {
+class BluetoothAdapterChromeOSTest : public testing::Test {
public:
virtual void SetUp() {
MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager;
@@ -67,7 +67,7 @@ class BluetoothAdapterChromeOsTest : public testing::Test {
scoped_refptr<BluetoothAdapter> adapter_;
};
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotPresent) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterNotPresent) {
// Create the default adapter instance;
// BluetoothManagerClient::DefaultAdapter will be called once, passing
// a callback to obtain the adapter path.
@@ -76,7 +76,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotPresent) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
ASSERT_TRUE(adapter_ != NULL);
@@ -94,7 +94,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotPresent) {
EXPECT_FALSE(adapter_->IsPresent());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithAddress) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterWithAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -106,7 +106,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithAddress) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -133,7 +133,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithAddress) {
EXPECT_EQ(adapter_address, adapter_->address());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterWithoutAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -145,7 +145,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -176,8 +176,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), true))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -188,7 +188,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
EXPECT_EQ(adapter_address, adapter_->address());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterBecomesPresentWithAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -200,7 +200,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback; make out it failed.
@@ -222,8 +222,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), true))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(adapter_path);
@@ -233,7 +233,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
EXPECT_EQ(adapter_address, adapter_->address());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterReplacedWithAddress) {
const dbus::ObjectPath initial_adapter_path("/fake/hci0");
const dbus::ObjectPath new_adapter_path("/fake/hci1");
const std::string initial_adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -247,7 +247,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -281,8 +281,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), true))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(new_adapter_path);
@@ -292,7 +292,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
EXPECT_EQ(new_adapter_address, adapter_->address());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterBecomesPresentWithoutAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -305,7 +305,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback; make out it failed.
@@ -326,8 +326,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), _))
.Times(0);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(adapter_path);
@@ -351,7 +351,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_EQ(adapter_address, adapter_->address());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterReplacedWithoutAddress) {
const dbus::ObjectPath initial_adapter_path("/fake/hci0");
const dbus::ObjectPath new_adapter_path("/fake/hci1");
const std::string initial_adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -365,7 +365,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -395,8 +395,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), false))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(new_adapter_path);
@@ -420,7 +420,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
EXPECT_EQ(new_adapter_address, adapter_->address());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterRemoved) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -432,7 +432,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -455,8 +455,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), false))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->AdapterRemoved(adapter_path);
@@ -465,7 +465,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
EXPECT_FALSE(adapter_->IsPresent());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterWithoutAddressRemoved) {
const dbus::ObjectPath adapter_path("/fake/hci0");
// Create the default adapter instance;
@@ -476,7 +476,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -498,8 +498,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), _))
.Times(0);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->AdapterRemoved(adapter_path);
@@ -508,7 +508,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
EXPECT_FALSE(adapter_->IsPresent());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyInitiallyFalse) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -521,7 +521,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -540,7 +540,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyInitiallyTrue) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -553,7 +553,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -582,7 +582,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyInitiallyTrueWithoutAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -595,7 +595,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -630,8 +630,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterPoweredChanged(adapter_.get(), true))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -641,7 +641,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterPoweredPropertyChanged) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -653,7 +653,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -681,8 +681,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
adapter_properties.powered.ReplaceValue(true);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -692,7 +692,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
EXPECT_TRUE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterPoweredPropertyUnchanged) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -704,7 +704,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -730,8 +730,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
EXPECT_CALL(adapter_observer, AdapterPoweredChanged(adapter_.get(), _))
.Times(0);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -741,7 +741,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
EXPECT_TRUE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyChangedWithoutAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -754,7 +754,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -782,8 +782,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterPoweredChanged(adapter_.get(), _))
.Times(0);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -811,7 +811,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyResetOnReplace) {
const dbus::ObjectPath initial_adapter_path("/fake/hci0");
const dbus::ObjectPath new_adapter_path("/fake/hci1");
@@ -826,7 +826,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -866,8 +866,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterPoweredChanged(adapter_.get(), false))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(new_adapter_path);
@@ -876,7 +876,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyResetOnReplaceWhenTrue) {
const dbus::ObjectPath initial_adapter_path("/fake/hci0");
const dbus::ObjectPath new_adapter_path("/fake/hci1");
@@ -891,7 +891,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -940,8 +940,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
.Times(1);
}
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(new_adapter_path);
@@ -950,7 +950,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterPoweredPropertyResetOnRemove) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -963,7 +963,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -988,8 +988,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterPoweredChanged(adapter_.get(), false))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->AdapterRemoved(adapter_path);
@@ -998,7 +998,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsPowered());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterSetPowered) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1010,7 +1010,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1031,9 +1031,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
.WillOnce(SaveArg<1>(&set_callback));
adapter_->SetPowered(true,
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// Reply to the callback to indicate success, the set callback we provided
@@ -1047,7 +1047,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
EXPECT_FALSE(error_callback_called_);
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterSetPoweredError) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1059,7 +1059,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1080,9 +1080,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
.WillOnce(SaveArg<1>(&set_callback));
adapter_->SetPowered(true,
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// Reply to the callback to indicate failure, the error callback we provided
@@ -1096,7 +1096,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
EXPECT_TRUE(error_callback_called_);
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyInitiallyFalse) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1109,7 +1109,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1128,7 +1128,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyInitiallyTrue) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1141,7 +1141,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1170,7 +1170,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyInitiallyTrueWithoutAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1183,7 +1183,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1218,8 +1218,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterScanningChanged(adapter_.get(), true))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -1229,7 +1229,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterDiscoveringPropertyChanged) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1241,7 +1241,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1269,8 +1269,8 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
adapter_properties.discovering.ReplaceValue(true);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -1280,7 +1280,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
EXPECT_TRUE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyUnchanged) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1293,7 +1293,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1320,8 +1320,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterScanningChanged(adapter_.get(), _))
.Times(0);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -1331,7 +1331,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyChangedWithoutAddress) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1344,7 +1344,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1372,8 +1372,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterScanningChanged(adapter_.get(), _))
.Times(0);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->AdapterPropertyChanged(adapter_path,
@@ -1401,7 +1401,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyResetOnReplace) {
const dbus::ObjectPath initial_adapter_path("/fake/hci0");
const dbus::ObjectPath new_adapter_path("/fake/hci1");
@@ -1416,7 +1416,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1456,8 +1456,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterScanningChanged(adapter_.get(), false))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(new_adapter_path);
@@ -1466,7 +1466,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyResetOnReplaceWhenTrue) {
const dbus::ObjectPath initial_adapter_path("/fake/hci0");
const dbus::ObjectPath new_adapter_path("/fake/hci1");
@@ -1481,7 +1481,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1532,8 +1532,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
.Times(1);
}
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->DefaultAdapterChanged(new_adapter_path);
@@ -1542,7 +1542,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterDiscoveringPropertyResetOnRemove) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1555,7 +1555,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1580,8 +1580,8 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(adapter_observer, AdapterScanningChanged(adapter_.get(), false))
.Times(1);
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
->AdapterRemoved(adapter_path);
@@ -1590,7 +1590,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsScanning());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotInitiallyDiscovering) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterNotInitiallyDiscovering) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1602,7 +1602,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotInitiallyDiscovering) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1620,7 +1620,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotInitiallyDiscovering) {
EXPECT_FALSE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscovering) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterStartDiscovering) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1632,7 +1632,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscovering) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1653,9 +1653,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscovering) {
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -1676,7 +1676,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscovering) {
EXPECT_TRUE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscoveringError) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterStartDiscoveringError) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1688,7 +1688,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscoveringError) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1709,9 +1709,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscoveringError) {
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate failure,
@@ -1732,7 +1732,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStartDiscoveringError) {
EXPECT_FALSE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSecondStartDiscovering) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterSecondStartDiscovering) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1744,7 +1744,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSecondStartDiscovering) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1765,9 +1765,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSecondStartDiscovering) {
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -1790,9 +1790,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSecondStartDiscovering) {
error_callback_called_ = false;
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success, we do not expect
@@ -1811,7 +1811,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSecondStartDiscovering) {
EXPECT_TRUE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterSecondStartDiscoveringError) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1824,7 +1824,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1845,9 +1845,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -1870,9 +1870,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate failure, we do not expect
@@ -1891,7 +1891,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscovering) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterStopDiscovering) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1903,7 +1903,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscovering) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -1924,9 +1924,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscovering) {
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -1950,9 +1950,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscovering) {
error_callback_called_ = false;
adapter_->StopDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -1970,7 +1970,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscovering) {
EXPECT_FALSE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscoveringError) {
+TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterStopDiscoveringError) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -1982,7 +1982,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscoveringError) {
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -2003,9 +2003,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscoveringError) {
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -2029,9 +2029,9 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscoveringError) {
error_callback_called_ = false;
adapter_->StopDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate failure,
@@ -2049,7 +2049,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterStopDiscoveringError) {
EXPECT_TRUE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterStopDiscoveringAfterSecondStart) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -2062,7 +2062,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -2083,9 +2083,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -2108,9 +2108,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success, we do not expect
@@ -2132,9 +2132,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StopDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success, we do not expect
@@ -2153,7 +2153,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_TRUE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterStopDiscoveringAfterSecondStartError) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -2166,7 +2166,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -2187,9 +2187,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -2212,9 +2212,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate failure, we do not expect
@@ -2236,9 +2236,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StopDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -2256,7 +2256,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_FALSE(adapter_->IsDiscovering());
}
-TEST_F(BluetoothAdapterChromeOsTest,
+TEST_F(BluetoothAdapterChromeOSTest,
DefaultAdapterSecondStopDiscoveringAfterSecondStart) {
const dbus::ObjectPath adapter_path("/fake/hci0");
const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
@@ -2269,7 +2269,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<0>(&adapter_callback));
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterChromeOSTest::SetAdapter,
base::Unretained(this)));
// Call the adapter callback;
@@ -2290,9 +2290,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
.WillOnce(SaveArg<1>(&start_discovery_callback));
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
@@ -2315,9 +2315,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StartDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success, we do not expect
@@ -2339,9 +2339,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StopDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success, we do not expect
@@ -2362,9 +2362,9 @@ TEST_F(BluetoothAdapterChromeOsTest,
error_callback_called_ = false;
adapter_->StopDiscovering(
- base::Bind(&BluetoothAdapterChromeOsTest::Callback,
+ base::Bind(&BluetoothAdapterChromeOSTest::Callback,
base::Unretained(this)),
- base::Bind(&BluetoothAdapterChromeOsTest::ErrorCallback,
+ base::Bind(&BluetoothAdapterChromeOSTest::ErrorCallback,
base::Unretained(this)));
// After returning to indicate success,
diff --git a/device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc b/device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc
index 2edfde4..a4e01de 100644
--- a/device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc
@@ -24,7 +24,7 @@ using ::testing::SaveArg;
namespace chromeos {
-class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
+class BluetoothAdapterDevicesChromeOSTest : public testing::Test {
public:
virtual void SetUp() {
MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager;
@@ -53,7 +53,7 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
.Times(1);
BluetoothAdapterFactory::GetAdapter(
- base::Bind(&BluetoothAdapterDevicesChromeOsTest::SetAdapter,
+ base::Bind(&BluetoothAdapterDevicesChromeOSTest::SetAdapter,
base::Unretained(this)));
ASSERT_TRUE(adapter_ != NULL);
@@ -85,8 +85,8 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
}
virtual void TearDown() {
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
EXPECT_CALL(*mock_device_client_, RemoveObserver(adapter_chromeos))
.Times(1);
EXPECT_CALL(*mock_adapter_client_, RemoveObserver(adapter_chromeos))
@@ -114,12 +114,12 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
MockBluetoothAdapter::Observer adapter_observer_;
};
-const dbus::ObjectPath BluetoothAdapterDevicesChromeOsTest::adapter_path_(
+const dbus::ObjectPath BluetoothAdapterDevicesChromeOSTest::adapter_path_(
"/fake/hci0");
-const std::string BluetoothAdapterDevicesChromeOsTest::adapter_address_ =
+const std::string BluetoothAdapterDevicesChromeOSTest::adapter_address_ =
"CA:FE:4A:C0:FE:FE";
-TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) {
+TEST_F(BluetoothAdapterDevicesChromeOSTest, DeviceRemovedAfterFound) {
const dbus::ObjectPath device_path("/fake/hci0/dev_ba_c0_11_00_00_01");
const std::string device_address = "BA:C0:11:00:00:01";
@@ -136,8 +136,8 @@ TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) {
.Times(1)
.WillOnce(SaveArg<1>(&device));
- BluetoothAdapterChromeOs* adapter_chromeos =
- static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
+ BluetoothAdapterChromeOS* adapter_chromeos =
+ static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
->DeviceFound(adapter_path_, device_address, device_properties);
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 0dea927..19d724f 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -69,8 +69,8 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
if (!default_adapter.Get().get()) {
#if defined(OS_CHROMEOS)
- chromeos::BluetoothAdapterChromeOs* new_adapter =
- new chromeos::BluetoothAdapterChromeOs;
+ chromeos::BluetoothAdapterChromeOS* new_adapter =
+ new chromeos::BluetoothAdapterChromeOS;
new_adapter->TrackDefaultAdapter();
default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
#elif defined(OS_WIN)
@@ -97,8 +97,8 @@ scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::MaybeGetAdapter() {
BluetoothAdapter* BluetoothAdapterFactory::Create(const std::string& address) {
BluetoothAdapter* adapter = NULL;
#if defined(OS_CHROMEOS)
- chromeos::BluetoothAdapterChromeOs* adapter_chromeos =
- new chromeos::BluetoothAdapterChromeOs;
+ chromeos::BluetoothAdapterChromeOS* adapter_chromeos =
+ new chromeos::BluetoothAdapterChromeOS;
adapter_chromeos->FindAdapter(address);
adapter = adapter_chromeos;
#elif defined(OS_WIN)
diff --git a/device/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc
index 3b044b5..996fb23 100644
--- a/device/bluetooth/bluetooth_device_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_chromeos.cc
@@ -40,8 +40,8 @@ using device::BluetoothSocket;
namespace chromeos {
-BluetoothDeviceChromeOs::BluetoothDeviceChromeOs(
- BluetoothAdapterChromeOs* adapter)
+BluetoothDeviceChromeOS::BluetoothDeviceChromeOS(
+ BluetoothAdapterChromeOS* adapter)
: BluetoothDevice(),
adapter_(adapter),
pairing_delegate_(NULL),
@@ -49,32 +49,32 @@ BluetoothDeviceChromeOs::BluetoothDeviceChromeOs(
weak_ptr_factory_(this) {
}
-BluetoothDeviceChromeOs::~BluetoothDeviceChromeOs() {
+BluetoothDeviceChromeOS::~BluetoothDeviceChromeOS() {
}
-bool BluetoothDeviceChromeOs::IsPaired() const {
+bool BluetoothDeviceChromeOS::IsPaired() const {
return !object_path_.value().empty();
}
const BluetoothDevice::ServiceList&
-BluetoothDeviceChromeOs::GetServices() const {
+BluetoothDeviceChromeOS::GetServices() const {
return service_uuids_;
}
-void BluetoothDeviceChromeOs::GetServiceRecords(
+void BluetoothDeviceChromeOS::GetServiceRecords(
const ServiceRecordsCallback& callback,
const ErrorCallback& error_callback) {
DBusThreadManager::Get()->GetBluetoothDeviceClient()->
DiscoverServices(
object_path_,
"", // empty pattern to browse all services
- base::Bind(&BluetoothDeviceChromeOs::CollectServiceRecordsCallback,
+ base::Bind(&BluetoothDeviceChromeOS::CollectServiceRecordsCallback,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-bool BluetoothDeviceChromeOs::ProvidesServiceWithUUID(
+bool BluetoothDeviceChromeOS::ProvidesServiceWithUUID(
const std::string& uuid) const {
const BluetoothDevice::ServiceList& services = GetServices();
for (BluetoothDevice::ServiceList::const_iterator iter = services.begin();
@@ -86,32 +86,32 @@ bool BluetoothDeviceChromeOs::ProvidesServiceWithUUID(
return false;
}
-void BluetoothDeviceChromeOs::ProvidesServiceWithName(
+void BluetoothDeviceChromeOS::ProvidesServiceWithName(
const std::string& name,
const ProvidesServiceCallback& callback) {
GetServiceRecords(
- base::Bind(&BluetoothDeviceChromeOs::SearchServicesForNameCallback,
+ base::Bind(&BluetoothDeviceChromeOS::SearchServicesForNameCallback,
weak_ptr_factory_.GetWeakPtr(),
name,
callback),
- base::Bind(&BluetoothDeviceChromeOs::SearchServicesForNameErrorCallback,
+ base::Bind(&BluetoothDeviceChromeOS::SearchServicesForNameErrorCallback,
weak_ptr_factory_.GetWeakPtr(),
callback));
}
-bool BluetoothDeviceChromeOs::ExpectingPinCode() const {
+bool BluetoothDeviceChromeOS::ExpectingPinCode() const {
return !pincode_callback_.is_null();
}
-bool BluetoothDeviceChromeOs::ExpectingPasskey() const {
+bool BluetoothDeviceChromeOS::ExpectingPasskey() const {
return !passkey_callback_.is_null();
}
-bool BluetoothDeviceChromeOs::ExpectingConfirmation() const {
+bool BluetoothDeviceChromeOS::ExpectingConfirmation() const {
return !confirmation_callback_.is_null();
}
-void BluetoothDeviceChromeOs::Connect(
+void BluetoothDeviceChromeOS::Connect(
PairingDelegate* pairing_delegate,
const base::Closure& callback,
const ConnectErrorCallback& error_callback) {
@@ -124,11 +124,11 @@ void BluetoothDeviceChromeOs::Connect(
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
CreateDevice(adapter_->object_path_,
address_,
- base::Bind(&BluetoothDeviceChromeOs::OnCreateDevice,
+ base::Bind(&BluetoothDeviceChromeOS::OnCreateDevice,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback),
- base::Bind(&BluetoothDeviceChromeOs::OnCreateDeviceError,
+ base::Bind(&BluetoothDeviceChromeOS::OnCreateDeviceError,
weak_ptr_factory_.GetWeakPtr(),
error_callback));
} else {
@@ -162,17 +162,17 @@ void BluetoothDeviceChromeOs::Connect(
address_,
agent_path,
bluetooth_agent::kDisplayYesNoCapability,
- base::Bind(&BluetoothDeviceChromeOs::OnCreateDevice,
+ base::Bind(&BluetoothDeviceChromeOS::OnCreateDevice,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback),
- base::Bind(&BluetoothDeviceChromeOs::OnCreateDeviceError,
+ base::Bind(&BluetoothDeviceChromeOS::OnCreateDeviceError,
weak_ptr_factory_.GetWeakPtr(),
error_callback));
}
}
-void BluetoothDeviceChromeOs::SetPinCode(const std::string& pincode) {
+void BluetoothDeviceChromeOS::SetPinCode(const std::string& pincode) {
if (!agent_.get() || pincode_callback_.is_null())
return;
@@ -180,7 +180,7 @@ void BluetoothDeviceChromeOs::SetPinCode(const std::string& pincode) {
pincode_callback_.Reset();
}
-void BluetoothDeviceChromeOs::SetPasskey(uint32 passkey) {
+void BluetoothDeviceChromeOS::SetPasskey(uint32 passkey) {
if (!agent_.get() || passkey_callback_.is_null())
return;
@@ -188,7 +188,7 @@ void BluetoothDeviceChromeOs::SetPasskey(uint32 passkey) {
passkey_callback_.Reset();
}
-void BluetoothDeviceChromeOs::ConfirmPairing() {
+void BluetoothDeviceChromeOS::ConfirmPairing() {
if (!agent_.get() || confirmation_callback_.is_null())
return;
@@ -196,7 +196,7 @@ void BluetoothDeviceChromeOs::ConfirmPairing() {
confirmation_callback_.Reset();
}
-void BluetoothDeviceChromeOs::RejectPairing() {
+void BluetoothDeviceChromeOS::RejectPairing() {
if (!agent_.get())
return;
@@ -214,7 +214,7 @@ void BluetoothDeviceChromeOs::RejectPairing() {
}
}
-void BluetoothDeviceChromeOs::CancelPairing() {
+void BluetoothDeviceChromeOS::CancelPairing() {
bool have_callback = false;
if (agent_.get()) {
if (!pincode_callback_.is_null()) {
@@ -239,7 +239,7 @@ void BluetoothDeviceChromeOs::CancelPairing() {
DBusThreadManager::Get()->GetBluetoothAdapterClient()->CancelDeviceCreation(
adapter_->object_path_,
address_,
- base::Bind(&BluetoothDeviceChromeOs::OnCancelDeviceCreation,
+ base::Bind(&BluetoothDeviceChromeOS::OnCancelDeviceCreation,
weak_ptr_factory_.GetWeakPtr()));
pairing_delegate_ = NULL;
@@ -247,40 +247,40 @@ void BluetoothDeviceChromeOs::CancelPairing() {
}
}
-void BluetoothDeviceChromeOs::Disconnect(const base::Closure& callback,
+void BluetoothDeviceChromeOS::Disconnect(const base::Closure& callback,
const ErrorCallback& error_callback) {
DBusThreadManager::Get()->GetBluetoothDeviceClient()->
Disconnect(object_path_,
- base::Bind(&BluetoothDeviceChromeOs::DisconnectCallback,
+ base::Bind(&BluetoothDeviceChromeOS::DisconnectCallback,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-void BluetoothDeviceChromeOs::Forget(const ErrorCallback& error_callback) {
+void BluetoothDeviceChromeOS::Forget(const ErrorCallback& error_callback) {
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
RemoveDevice(adapter_->object_path_,
object_path_,
- base::Bind(&BluetoothDeviceChromeOs::ForgetCallback,
+ base::Bind(&BluetoothDeviceChromeOS::ForgetCallback,
weak_ptr_factory_.GetWeakPtr(),
error_callback));
}
-void BluetoothDeviceChromeOs::ConnectToService(const std::string& service_uuid,
+void BluetoothDeviceChromeOS::ConnectToService(const std::string& service_uuid,
const SocketCallback& callback) {
GetServiceRecords(
- base::Bind(&BluetoothDeviceChromeOs::GetServiceRecordsForConnectCallback,
+ base::Bind(&BluetoothDeviceChromeOS::GetServiceRecordsForConnectCallback,
weak_ptr_factory_.GetWeakPtr(),
service_uuid,
callback),
base::Bind(
- &BluetoothDeviceChromeOs::GetServiceRecordsForConnectErrorCallback,
+ &BluetoothDeviceChromeOS::GetServiceRecordsForConnectErrorCallback,
weak_ptr_factory_.GetWeakPtr(),
callback));
}
-void BluetoothDeviceChromeOs::SetOutOfBandPairingData(
+void BluetoothDeviceChromeOS::SetOutOfBandPairingData(
const BluetoothOutOfBandPairingData& data,
const base::Closure& callback,
const ErrorCallback& error_callback) {
@@ -289,37 +289,37 @@ void BluetoothDeviceChromeOs::SetOutOfBandPairingData(
object_path_,
address(),
data,
- base::Bind(&BluetoothDeviceChromeOs::OnRemoteDataCallback,
+ base::Bind(&BluetoothDeviceChromeOS::OnRemoteDataCallback,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-void BluetoothDeviceChromeOs::ClearOutOfBandPairingData(
+void BluetoothDeviceChromeOS::ClearOutOfBandPairingData(
const base::Closure& callback,
const ErrorCallback& error_callback) {
DBusThreadManager::Get()->GetBluetoothOutOfBandClient()->
RemoveRemoteData(
object_path_,
address(),
- base::Bind(&BluetoothDeviceChromeOs::OnRemoteDataCallback,
+ base::Bind(&BluetoothDeviceChromeOS::OnRemoteDataCallback,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-void BluetoothDeviceChromeOs::SetObjectPath(
+void BluetoothDeviceChromeOS::SetObjectPath(
const dbus::ObjectPath& object_path) {
DCHECK(object_path_ == dbus::ObjectPath(""));
object_path_ = object_path;
}
-void BluetoothDeviceChromeOs::RemoveObjectPath() {
+void BluetoothDeviceChromeOS::RemoveObjectPath() {
DCHECK(object_path_ != dbus::ObjectPath(""));
object_path_ = dbus::ObjectPath("");
}
-void BluetoothDeviceChromeOs::Update(
+void BluetoothDeviceChromeOS::Update(
const BluetoothDeviceClient::Properties* properties,
bool update_state) {
std::string address = properties->address.value();
@@ -346,7 +346,7 @@ void BluetoothDeviceChromeOs::Update(
}
}
-void BluetoothDeviceChromeOs::OnCreateDevice(
+void BluetoothDeviceChromeOS::OnCreateDevice(
const base::Closure& callback,
const ConnectErrorCallback& error_callback,
const dbus::ObjectPath& device_path) {
@@ -368,7 +368,7 @@ void BluetoothDeviceChromeOs::OnCreateDevice(
DBusThreadManager::Get()->GetBluetoothDeviceClient()->
GetProperties(object_path_)->trusted.Set(
true,
- base::Bind(&BluetoothDeviceChromeOs::OnSetTrusted,
+ base::Bind(&BluetoothDeviceChromeOS::OnSetTrusted,
weak_ptr_factory_.GetWeakPtr(),
callback,
base::Bind(error_callback,
@@ -379,7 +379,7 @@ void BluetoothDeviceChromeOs::OnCreateDevice(
ConnectApplications(callback, error_callback);
}
-void BluetoothDeviceChromeOs::OnCreateDeviceError(
+void BluetoothDeviceChromeOS::OnCreateDeviceError(
const ConnectErrorCallback& error_callback,
const std::string& error_name,
const std::string& error_message) {
@@ -405,7 +405,7 @@ void BluetoothDeviceChromeOs::OnCreateDeviceError(
error_callback.Run(error_code);
}
-void BluetoothDeviceChromeOs::CollectServiceRecordsCallback(
+void BluetoothDeviceChromeOS::CollectServiceRecordsCallback(
const ServiceRecordsCallback& callback,
const ErrorCallback& error_callback,
const dbus::ObjectPath& device_path,
@@ -425,7 +425,7 @@ void BluetoothDeviceChromeOs::CollectServiceRecordsCallback(
callback.Run(records);
}
-void BluetoothDeviceChromeOs::OnSetTrusted(const base::Closure& callback,
+void BluetoothDeviceChromeOS::OnSetTrusted(const base::Closure& callback,
const ErrorCallback& error_callback,
bool success) {
if (success) {
@@ -436,20 +436,20 @@ void BluetoothDeviceChromeOs::OnSetTrusted(const base::Closure& callback,
}
}
-void BluetoothDeviceChromeOs::ConnectApplications(
+void BluetoothDeviceChromeOS::ConnectApplications(
const base::Closure& callback,
const ConnectErrorCallback& error_callback) {
// Introspect the device object to determine supported applications.
DBusThreadManager::Get()->GetIntrospectableClient()->
Introspect(bluetooth_device::kBluetoothDeviceServiceName,
object_path_,
- base::Bind(&BluetoothDeviceChromeOs::OnIntrospect,
+ base::Bind(&BluetoothDeviceChromeOS::OnIntrospect,
weak_ptr_factory_.GetWeakPtr(),
callback,
error_callback));
}
-void BluetoothDeviceChromeOs::OnIntrospect(
+void BluetoothDeviceChromeOS::OnIntrospect(
const base::Closure& callback,
const ConnectErrorCallback& error_callback,
const std::string& service_name,
@@ -478,11 +478,11 @@ void BluetoothDeviceChromeOs::OnIntrospect(
// Supports Input interface.
DBusThreadManager::Get()->GetBluetoothInputClient()->
Connect(object_path_,
- base::Bind(&BluetoothDeviceChromeOs::OnConnect,
+ base::Bind(&BluetoothDeviceChromeOS::OnConnect,
weak_ptr_factory_.GetWeakPtr(),
callback,
*iter),
- base::Bind(&BluetoothDeviceChromeOs::OnConnectError,
+ base::Bind(&BluetoothDeviceChromeOS::OnConnectError,
weak_ptr_factory_.GetWeakPtr(),
error_callback, *iter));
}
@@ -497,7 +497,7 @@ void BluetoothDeviceChromeOs::OnIntrospect(
callback.Run();
}
-void BluetoothDeviceChromeOs::OnConnect(const base::Closure& callback,
+void BluetoothDeviceChromeOS::OnConnect(const base::Closure& callback,
const std::string& interface_name,
const dbus::ObjectPath& device_path) {
DVLOG(1) << "Application connection successful: " << device_path.value()
@@ -515,7 +515,7 @@ void BluetoothDeviceChromeOs::OnConnect(const base::Closure& callback,
}
}
-void BluetoothDeviceChromeOs::OnConnectError(
+void BluetoothDeviceChromeOS::OnConnectError(
const ConnectErrorCallback& error_callback,
const std::string& interface_name,
const dbus::ObjectPath& device_path,
@@ -543,7 +543,7 @@ void BluetoothDeviceChromeOs::OnConnectError(
error_callback.Run(error_code);
}
-void BluetoothDeviceChromeOs::DisconnectCallback(
+void BluetoothDeviceChromeOS::DisconnectCallback(
const base::Closure& callback,
const ErrorCallback& error_callback,
const dbus::ObjectPath& device_path,
@@ -558,7 +558,7 @@ void BluetoothDeviceChromeOs::DisconnectCallback(
}
}
-void BluetoothDeviceChromeOs::ForgetCallback(
+void BluetoothDeviceChromeOS::ForgetCallback(
const ErrorCallback& error_callback,
const dbus::ObjectPath& adapter_path,
bool success) {
@@ -573,19 +573,19 @@ void BluetoothDeviceChromeOs::ForgetCallback(
}
}
-void BluetoothDeviceChromeOs::OnCancelDeviceCreation(
+void BluetoothDeviceChromeOS::OnCancelDeviceCreation(
const dbus::ObjectPath& adapter_path,
bool success) {
if (!success)
LOG(WARNING) << "CancelDeviceCreation failed: " << address_;
}
-void BluetoothDeviceChromeOs::SearchServicesForNameErrorCallback(
+void BluetoothDeviceChromeOS::SearchServicesForNameErrorCallback(
const ProvidesServiceCallback& callback) {
callback.Run(false);
}
-void BluetoothDeviceChromeOs::SearchServicesForNameCallback(
+void BluetoothDeviceChromeOS::SearchServicesForNameCallback(
const std::string& name,
const ProvidesServiceCallback& callback,
const ServiceRecordList& list) {
@@ -599,12 +599,12 @@ void BluetoothDeviceChromeOs::SearchServicesForNameCallback(
callback.Run(false);
}
-void BluetoothDeviceChromeOs::GetServiceRecordsForConnectErrorCallback(
+void BluetoothDeviceChromeOS::GetServiceRecordsForConnectErrorCallback(
const SocketCallback& callback) {
callback.Run(NULL);
}
-void BluetoothDeviceChromeOs::GetServiceRecordsForConnectCallback(
+void BluetoothDeviceChromeOS::GetServiceRecordsForConnectCallback(
const std::string& service_uuid,
const SocketCallback& callback,
const ServiceRecordList& list) {
@@ -613,7 +613,7 @@ void BluetoothDeviceChromeOs::GetServiceRecordsForConnectCallback(
if ((*i)->uuid() == service_uuid) {
// If multiple service records are found, use the first one that works.
scoped_refptr<BluetoothSocket> socket(
- BluetoothSocketChromeOs::CreateBluetoothSocket(**i));
+ BluetoothSocketChromeOS::CreateBluetoothSocket(**i));
if (socket.get() != NULL) {
callback.Run(socket);
return;
@@ -623,7 +623,7 @@ void BluetoothDeviceChromeOs::GetServiceRecordsForConnectCallback(
callback.Run(NULL);
}
-void BluetoothDeviceChromeOs::OnRemoteDataCallback(
+void BluetoothDeviceChromeOS::OnRemoteDataCallback(
const base::Closure& callback,
const ErrorCallback& error_callback,
bool success) {
@@ -633,12 +633,12 @@ void BluetoothDeviceChromeOs::OnRemoteDataCallback(
error_callback.Run();
}
-void BluetoothDeviceChromeOs::DisconnectRequested(
+void BluetoothDeviceChromeOS::DisconnectRequested(
const dbus::ObjectPath& object_path) {
DCHECK(object_path == object_path_);
}
-void BluetoothDeviceChromeOs::Release() {
+void BluetoothDeviceChromeOS::Release() {
DCHECK(agent_.get());
DVLOG(1) << "Release: " << address_;
@@ -653,7 +653,7 @@ void BluetoothDeviceChromeOs::Release() {
agent_.reset();
}
-void BluetoothDeviceChromeOs::RequestPinCode(
+void BluetoothDeviceChromeOS::RequestPinCode(
const dbus::ObjectPath& device_path,
const PinCodeCallback& callback) {
DCHECK(agent_.get());
@@ -665,7 +665,7 @@ void BluetoothDeviceChromeOs::RequestPinCode(
pairing_delegate_->RequestPinCode(this);
}
-void BluetoothDeviceChromeOs::RequestPasskey(
+void BluetoothDeviceChromeOS::RequestPasskey(
const dbus::ObjectPath& device_path,
const PasskeyCallback& callback) {
DCHECK(agent_.get());
@@ -678,7 +678,7 @@ void BluetoothDeviceChromeOs::RequestPasskey(
pairing_delegate_->RequestPasskey(this);
}
-void BluetoothDeviceChromeOs::DisplayPinCode(
+void BluetoothDeviceChromeOS::DisplayPinCode(
const dbus::ObjectPath& device_path,
const std::string& pincode) {
DCHECK(agent_.get());
@@ -689,7 +689,7 @@ void BluetoothDeviceChromeOs::DisplayPinCode(
pairing_delegate_->DisplayPinCode(this, pincode);
}
-void BluetoothDeviceChromeOs::DisplayPasskey(
+void BluetoothDeviceChromeOS::DisplayPasskey(
const dbus::ObjectPath& device_path,
uint32 passkey) {
DCHECK(agent_.get());
@@ -700,7 +700,7 @@ void BluetoothDeviceChromeOs::DisplayPasskey(
pairing_delegate_->DisplayPasskey(this, passkey);
}
-void BluetoothDeviceChromeOs::RequestConfirmation(
+void BluetoothDeviceChromeOS::RequestConfirmation(
const dbus::ObjectPath& device_path,
uint32 passkey,
const ConfirmationCallback& callback) {
@@ -714,7 +714,7 @@ void BluetoothDeviceChromeOs::RequestConfirmation(
pairing_delegate_->ConfirmPasskey(this, passkey);
}
-void BluetoothDeviceChromeOs::Authorize(const dbus::ObjectPath& device_path,
+void BluetoothDeviceChromeOS::Authorize(const dbus::ObjectPath& device_path,
const std::string& uuid,
const ConfirmationCallback& callback) {
DCHECK(agent_.get());
@@ -724,7 +724,7 @@ void BluetoothDeviceChromeOs::Authorize(const dbus::ObjectPath& device_path,
callback.Run(REJECTED);
}
-void BluetoothDeviceChromeOs::ConfirmModeChange(
+void BluetoothDeviceChromeOS::ConfirmModeChange(
Mode mode,
const ConfirmationCallback& callback) {
DCHECK(agent_.get());
@@ -733,7 +733,7 @@ void BluetoothDeviceChromeOs::ConfirmModeChange(
callback.Run(REJECTED);
}
-void BluetoothDeviceChromeOs::Cancel() {
+void BluetoothDeviceChromeOS::Cancel() {
DCHECK(agent_.get());
DVLOG(1) << "Cancel: " << address_;
@@ -743,9 +743,9 @@ void BluetoothDeviceChromeOs::Cancel() {
// static
-BluetoothDeviceChromeOs* BluetoothDeviceChromeOs::Create(
- BluetoothAdapterChromeOs* adapter) {
- return new BluetoothDeviceChromeOs(adapter);
+BluetoothDeviceChromeOS* BluetoothDeviceChromeOS::Create(
+ BluetoothAdapterChromeOS* adapter) {
+ return new BluetoothDeviceChromeOS(adapter);
}
} // namespace chromeos
diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
index e0dfda0..6502078 100644
--- a/device/bluetooth/bluetooth_device_chromeos.h
+++ b/device/bluetooth/bluetooth_device_chromeos.h
@@ -28,16 +28,16 @@ struct BluetoothOutOfBandPairingData;
namespace chromeos {
-class BluetoothAdapterChromeOs;
+class BluetoothAdapterChromeOS;
-// The BluetoothDeviceChromeOs class is an implementation of BluetoothDevice
+// The BluetoothDeviceChromeOS class is an implementation of BluetoothDevice
// for Chrome OS platform.
-class BluetoothDeviceChromeOs
+class BluetoothDeviceChromeOS
: public device::BluetoothDevice,
public BluetoothDeviceClient::Observer,
public BluetoothAgentServiceProvider::Delegate {
public:
- virtual ~BluetoothDeviceChromeOs();
+ virtual ~BluetoothDeviceChromeOS();
// BluetoothDevice override
virtual bool IsPaired() const OVERRIDE;
@@ -77,10 +77,10 @@ class BluetoothDeviceChromeOs
const ErrorCallback& error_callback) OVERRIDE;
private:
- friend class BluetoothAdapterChromeOs;
+ friend class BluetoothAdapterChromeOS;
friend class device::MockBluetoothDevice;
- explicit BluetoothDeviceChromeOs(BluetoothAdapterChromeOs* adapter);
+ explicit BluetoothDeviceChromeOS(BluetoothAdapterChromeOS* adapter);
// Sets the dbus object path for the device to |object_path|, indicating
// that the device has gone from being discovered to paired or bonded.
@@ -335,12 +335,12 @@ class BluetoothDeviceChromeOs
// the request failed before a reply was returned from the device.
virtual void Cancel() OVERRIDE;
- // Creates a new BluetoothDeviceChromeOs object bound to the adapter
+ // Creates a new BluetoothDeviceChromeOS object bound to the adapter
// |adapter|.
- static BluetoothDeviceChromeOs* Create(BluetoothAdapterChromeOs* adapter);
+ static BluetoothDeviceChromeOS* Create(BluetoothAdapterChromeOS* adapter);
// The adapter that owns this device instance.
- BluetoothAdapterChromeOs* adapter_;
+ BluetoothAdapterChromeOS* adapter_;
// The dbus object path of the device, will be empty if the device has only
// been discovered and not yet paired with.
@@ -370,9 +370,9 @@ class BluetoothDeviceChromeOs
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
- base::WeakPtrFactory<BluetoothDeviceChromeOs> weak_ptr_factory_;
+ base::WeakPtrFactory<BluetoothDeviceChromeOS> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOs);
+ DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOS);
};
} // namespace chromeos
diff --git a/device/bluetooth/bluetooth_socket_chromeos.cc b/device/bluetooth/bluetooth_socket_chromeos.cc
index 44506fa..bc3ca56 100644
--- a/device/bluetooth/bluetooth_socket_chromeos.cc
+++ b/device/bluetooth/bluetooth_socket_chromeos.cc
@@ -26,20 +26,20 @@ using device::BluetoothSocket;
namespace chromeos {
-BluetoothSocketChromeOs::BluetoothSocketChromeOs(
+BluetoothSocketChromeOS::BluetoothSocketChromeOS(
const std::string& address, int fd)
: address_(address),
fd_(fd) {
}
-BluetoothSocketChromeOs::~BluetoothSocketChromeOs() {
+BluetoothSocketChromeOS::~BluetoothSocketChromeOS() {
close(fd_);
}
// static
-scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
+scoped_refptr<BluetoothSocket> BluetoothSocketChromeOS::CreateBluetoothSocket(
const BluetoothServiceRecord& service_record) {
- BluetoothSocketChromeOs* bluetooth_socket = NULL;
+ BluetoothSocketChromeOS* bluetooth_socket = NULL;
if (service_record.SupportsRfcomm()) {
int socket_fd = socket(
AF_BLUETOOTH, SOCK_STREAM | SOCK_NONBLOCK, BTPROTO_RFCOMM);
@@ -53,7 +53,7 @@ scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
sizeof(socket_address));
int errsv = errno;
if (status == 0 || errno == EINPROGRESS) {
- bluetooth_socket = new BluetoothSocketChromeOs(service_record.address(),
+ bluetooth_socket = new BluetoothSocketChromeOS(service_record.address(),
socket_fd);
} else {
LOG(ERROR) << "Failed to connect bluetooth socket "
@@ -64,14 +64,14 @@ scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
}
// TODO(bryeung): add support for L2CAP sockets as well.
- return scoped_refptr<BluetoothSocketChromeOs>(bluetooth_socket);
+ return scoped_refptr<BluetoothSocketChromeOS>(bluetooth_socket);
}
-int BluetoothSocketChromeOs::fd() const {
+int BluetoothSocketChromeOS::fd() const {
return fd_;
}
-bool BluetoothSocketChromeOs::Receive(net::GrowableIOBuffer* buffer) {
+bool BluetoothSocketChromeOS::Receive(net::GrowableIOBuffer* buffer) {
buffer->SetCapacity(1024);
ssize_t bytes_read;
do {
@@ -89,7 +89,7 @@ bool BluetoothSocketChromeOs::Receive(net::GrowableIOBuffer* buffer) {
return true;
}
-bool BluetoothSocketChromeOs::Send(net::DrainableIOBuffer* buffer) {
+bool BluetoothSocketChromeOS::Send(net::DrainableIOBuffer* buffer) {
ssize_t bytes_written;
do {
bytes_written = write(fd_, buffer, buffer->BytesRemaining());
@@ -104,7 +104,7 @@ bool BluetoothSocketChromeOs::Send(net::DrainableIOBuffer* buffer) {
return true;
}
-std::string BluetoothSocketChromeOs::GetLastErrorMessage() const {
+std::string BluetoothSocketChromeOS::GetLastErrorMessage() const {
return error_message_;
}
diff --git a/device/bluetooth/bluetooth_socket_chromeos.h b/device/bluetooth/bluetooth_socket_chromeos.h
index 8d4b84a..4be8966 100644
--- a/device/bluetooth/bluetooth_socket_chromeos.h
+++ b/device/bluetooth/bluetooth_socket_chromeos.h
@@ -27,7 +27,7 @@ namespace chromeos {
// This class is an implementation of BluetoothSocket class for Chrome OS
// platform.
-class BluetoothSocketChromeOs : public device::BluetoothSocket {
+class BluetoothSocketChromeOS : public device::BluetoothSocket {
public:
static scoped_refptr<device::BluetoothSocket> CreateBluetoothSocket(
const device::BluetoothServiceRecord& service_record);
@@ -39,16 +39,16 @@ class BluetoothSocketChromeOs : public device::BluetoothSocket {
virtual std::string GetLastErrorMessage() const OVERRIDE;
protected:
- virtual ~BluetoothSocketChromeOs();
+ virtual ~BluetoothSocketChromeOS();
private:
- BluetoothSocketChromeOs(const std::string& address, int fd);
+ BluetoothSocketChromeOS(const std::string& address, int fd);
const std::string address_;
const int fd_;
std::string error_message_;
- DISALLOW_COPY_AND_ASSIGN(BluetoothSocketChromeOs);
+ DISALLOW_COPY_AND_ASSIGN(BluetoothSocketChromeOS);
};
} // namespace chromeos
generated by cgit v1.1 at 2024-09-19 10:43:57 +0000