bluetooth: macOS: Removing useless |.get()|

device/bluetooth/bluetooth_adapter_mac_unittest.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_adapter_mac.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 51 matching lines @@
     return adapter_->GetDevice(address);
   }
 
   CBPeripheral* CreateMockPeripheral(const char* identifier) {
     if (!BluetoothAdapterMac::IsLowEnergyAvailable()) {
       LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
       return nil;
     }
     base::scoped_nsobject<MockCBPeripheral> mock_peripheral(
         [[MockCBPeripheral alloc] initWithUTF8StringIdentifier:identifier]);
-    return [mock_peripheral.get().peripheral retain];
+    return [[mock_peripheral peripheral] retain];
   }
 
   NSDictionary* AdvertisementData() {
     NSDictionary* advertisement_data = @{
       CBAdvertisementDataIsConnectable : @(YES),
       CBAdvertisementDataServiceDataKey : [NSDictionary dictionary],
     };
     return [advertisement_data retain];
   }
 
@@ skipping 10 matching lines @@
   }
 
   bool SetMockCentralManager(CBCentralManagerState desired_state) {
     if (!BluetoothAdapterMac::IsLowEnergyAvailable()) {
       LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
       return false;
     }
     mock_central_manager_.reset([[MockCentralManager alloc] init]);
     [mock_central_manager_ setState:desired_state];
     CBCentralManager* centralManager =
-        (CBCentralManager*)mock_central_manager_.get();
+        (CBCentralManager*)(mock_central_manager_.get());

[ortuno, 2017/05/26 16:33:02]

Do we have an issue to get rid of c-style casting?

[jlebel, 2017/05/26 16:51:14]

No, but I'm working on that one right now. I didn't mean to touch it in this
patch.

     adapter_mac_->SetCentralManagerForTesting(centralManager);
     return true;
   }
 
   void AddDiscoverySession(BluetoothDiscoveryFilter* discovery_filter) {
     adapter_mac_->AddDiscoverySession(
         discovery_filter,
         base::Bind(&BluetoothAdapterMacTest::Callback, base::Unretained(this)),
         base::Bind(&BluetoothAdapterMacTest::DiscoveryErrorCallback,
                    base::Unretained(this)));
@@ skipping 113 matching lines @@
 
   // Check that stopScan was not called.
   EXPECT_EQ(0, [mock_central_manager_ stopScanCallCount]);
 }
 
 TEST_F(BluetoothAdapterMacTest, CheckGetPeripheralHashAddress) {
   if (!SetMockCentralManager(CBCentralManagerStatePoweredOn))
     return;
   base::scoped_nsobject<CBPeripheral> mock_peripheral(
       CreateMockPeripheral(kTestNSUUID));
-  if (mock_peripheral.get() == nil)
+  if (!mock_peripheral)
     return;
   EXPECT_EQ(kTestHashAddress, GetHashAddress(mock_peripheral));
 }
 
 TEST_F(BluetoothAdapterMacTest, LowEnergyDeviceUpdatedNewDevice) {
   if (!SetMockCentralManager(CBCentralManagerStatePoweredOn))
     return;
   base::scoped_nsobject<CBPeripheral> mock_peripheral(
       CreateMockPeripheral(kTestNSUUID));
-  if (mock_peripheral.get() == nil)
+  if (!mock_peripheral)
     return;
   base::scoped_nsobject<NSDictionary> advertisement_data(AdvertisementData());
 
   EXPECT_EQ(0, NumDevices());
   EXPECT_FALSE(DevicePresent(mock_peripheral));
   LowEnergyDeviceUpdated(mock_peripheral, advertisement_data, kTestRssi);
   EXPECT_EQ(1, NumDevices());
   EXPECT_TRUE(DevicePresent(mock_peripheral));
 }
 
 }  // namespace device