Commit 0761425c authored by dcheng's avatar dcheng Committed by Commit bot

Remove implicit conversions from scoped_refptr to T* in device

This patch was generated by running the rewrite_scoped_refptr clang tool
on a ChromeOS build.

BUG=110610

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

Cr-Commit-Position: refs/heads/master@{#294898}
parent 30a7d44d
...@@ -56,7 +56,7 @@ class TestObserver : public BluetoothAdapter::Observer { ...@@ -56,7 +56,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void AdapterPresentChanged(BluetoothAdapter* adapter, virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
bool present) OVERRIDE { bool present) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++present_changed_count_; ++present_changed_count_;
last_present_ = present; last_present_ = present;
...@@ -64,7 +64,7 @@ class TestObserver : public BluetoothAdapter::Observer { ...@@ -64,7 +64,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void AdapterPoweredChanged(BluetoothAdapter* adapter, virtual void AdapterPoweredChanged(BluetoothAdapter* adapter,
bool powered) OVERRIDE { bool powered) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++powered_changed_count_; ++powered_changed_count_;
last_powered_ = powered; last_powered_ = powered;
...@@ -72,14 +72,14 @@ class TestObserver : public BluetoothAdapter::Observer { ...@@ -72,14 +72,14 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void AdapterDiscoverableChanged(BluetoothAdapter* adapter, virtual void AdapterDiscoverableChanged(BluetoothAdapter* adapter,
bool discoverable) OVERRIDE { bool discoverable) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++discoverable_changed_count_; ++discoverable_changed_count_;
} }
virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter, virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter,
bool discovering) OVERRIDE { bool discovering) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++discovering_changed_count_; ++discovering_changed_count_;
last_discovering_ = discovering; last_discovering_ = discovering;
...@@ -87,7 +87,7 @@ class TestObserver : public BluetoothAdapter::Observer { ...@@ -87,7 +87,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void DeviceAdded(BluetoothAdapter* adapter, virtual void DeviceAdded(BluetoothAdapter* adapter,
BluetoothDevice* device) OVERRIDE { BluetoothDevice* device) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++device_added_count_; ++device_added_count_;
last_device_ = device; last_device_ = device;
...@@ -98,7 +98,7 @@ class TestObserver : public BluetoothAdapter::Observer { ...@@ -98,7 +98,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void DeviceChanged(BluetoothAdapter* adapter, virtual void DeviceChanged(BluetoothAdapter* adapter,
BluetoothDevice* device) OVERRIDE { BluetoothDevice* device) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++device_changed_count_; ++device_changed_count_;
last_device_ = device; last_device_ = device;
...@@ -109,7 +109,7 @@ class TestObserver : public BluetoothAdapter::Observer { ...@@ -109,7 +109,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void DeviceRemoved(BluetoothAdapter* adapter, virtual void DeviceRemoved(BluetoothAdapter* adapter,
BluetoothDevice* device) OVERRIDE { BluetoothDevice* device) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
++device_removed_count_; ++device_removed_count_;
// Can't save device, it may be freed // Can't save device, it may be freed
......
...@@ -245,7 +245,7 @@ void BluetoothSocketChromeOS::RegisterProfile( ...@@ -245,7 +245,7 @@ void BluetoothSocketChromeOS::RegisterProfile(
// Before reaching out to the Bluetooth Daemon to register a listening socket, // Before reaching out to the Bluetooth Daemon to register a listening socket,
// make sure it's actually running. If not, report success and carry on; // make sure it's actually running. If not, report success and carry on;
// the profile will be registered when the daemon becomes available. // the profile will be registered when the daemon becomes available.
if (adapter_ && !adapter_->IsPresent()) { if (adapter_.get() && !adapter_->IsPresent()) {
VLOG(1) << object_path_.value() << ": Delaying profile registration."; VLOG(1) << object_path_.value() << ": Delaying profile registration.";
success_callback.Run(); success_callback.Run();
return; return;
......
...@@ -61,34 +61,34 @@ class TestObserver : public NfcAdapter::Observer, ...@@ -61,34 +61,34 @@ class TestObserver : public NfcAdapter::Observer,
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void AdapterPresentChanged(NfcAdapter* adapter, virtual void AdapterPresentChanged(NfcAdapter* adapter,
bool present) OVERRIDE { bool present) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
present_changed_count_++; present_changed_count_++;
} }
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void AdapterPoweredChanged(NfcAdapter* adapter, virtual void AdapterPoweredChanged(NfcAdapter* adapter,
bool powered) OVERRIDE { bool powered) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
powered_changed_count_++; powered_changed_count_++;
} }
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void AdapterPollingChanged(NfcAdapter* adapter, virtual void AdapterPollingChanged(NfcAdapter* adapter,
bool powered) OVERRIDE { bool powered) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
polling_changed_count_++; polling_changed_count_++;
} }
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE { virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
peer_count_++; peer_count_++;
peer_identifier_ = peer->GetIdentifier(); peer_identifier_ = peer->GetIdentifier();
} }
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE { virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
EXPECT_EQ(peer_identifier_, peer->GetIdentifier()); EXPECT_EQ(peer_identifier_, peer->GetIdentifier());
peer_count_--; peer_count_--;
peer_identifier_.clear(); peer_identifier_.clear();
...@@ -96,14 +96,14 @@ class TestObserver : public NfcAdapter::Observer, ...@@ -96,14 +96,14 @@ class TestObserver : public NfcAdapter::Observer,
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) OVERRIDE { virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
tag_count_++; tag_count_++;
tag_identifier_ = tag->GetIdentifier(); tag_identifier_ = tag->GetIdentifier();
} }
// NfcAdapter::Observer override. // NfcAdapter::Observer override.
virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) OVERRIDE { virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) OVERRIDE {
EXPECT_EQ(adapter_, adapter); EXPECT_EQ(adapter_.get(), adapter);
EXPECT_EQ(tag_identifier_, tag->GetIdentifier()); EXPECT_EQ(tag_identifier_, tag->GetIdentifier());
tag_count_--; tag_count_--;
tag_identifier_.clear(); tag_identifier_.clear();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment