Mac: Make ScopedTypeRef require explicit constructors

device/bluetooth/test/bluetooth_test_mac.mm

 // Copyright 2015 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/test/bluetooth_test_mac.h"
 
 #include <stdint.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 23 matching lines @@
   MockCentralManager* get() { return mock_central_manager_.get(); };
 
  private:
   scoped_nsobject<MockCentralManager> mock_central_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedMockCentralManager);
 };
 
 namespace {
 
-NSDictionary* CreateAdvertisementData(NSString* name, NSArray* uuids) {
-  NSMutableDictionary* advertisement_data =
+scoped_nsobject<NSDictionary> CreateAdvertisementData(NSString* name,

[jlebel, 2016/06/01 02:50:01]

Nit: Since there is no question about retain/release now, this function can be
renamed to AdvertisementData()

[ccameron, 2016/06/02 23:11:18]

n/a now.

+                                                      NSArray* uuids) {
+  scoped_nsobject<NSMutableDictionary> advertisement_data(
       [NSMutableDictionary dictionaryWithDictionary:@{
         CBAdvertisementDataLocalNameKey : name,
         CBAdvertisementDataServiceDataKey : @{},
         CBAdvertisementDataIsConnectable : @(YES),
-      }];
+      }]);
   if (uuids) {
     [advertisement_data setObject:uuids
                            forKey:CBAdvertisementDataServiceUUIDsKey];
   }
-  return [advertisement_data retain];
+  return scoped_nsobject<NSDictionary>(advertisement_data);

[sky, 2016/06/01 03:35:33]

This seems weird. is there nothing like std::move for scoped_nsobject?

[ccameron, 2016/06/02 23:11:18]

This was a cast from NSMutableDictionary to its superclass NSDictionary.

I've changed this to a base::scoped_policy::RETAIN of the sub-class (see
comments from the thread).

 }
 
 }  // namespace
 
 // UUID1 hashes to kTestDeviceAddress1, and UUID2 to kTestDeviceAddress2.
 const std::string BluetoothTestMac::kTestPeripheralUUID1 =
     "34045B00-0000-0000-0000-000000000000";
 const std::string BluetoothTestMac::kTestPeripheralUUID2 =
     "EC1B8F00-0000-0000-0000-000000000000";
 
@@ skipping 156 matching lines @@
                                     error:nil];
 }
 
 void BluetoothTestMac::SimulateGattServicesDiscovered(
     BluetoothDevice* device,
     const std::vector<std::string>& uuids) {
   BluetoothLowEnergyDeviceMac* device_mac =
       static_cast<BluetoothLowEnergyDeviceMac*>(device);
   CBPeripheral* peripheral = device_mac->GetPeripheral();
   MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
-  scoped_nsobject<NSMutableArray> services = [[NSMutableArray alloc] init];
+  scoped_nsobject<NSMutableArray> services([[NSMutableArray alloc] init]);
   for (auto uuid : uuids) {
     CBUUID* cb_service_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
     [services addObject:cb_service_uuid];
   }
   [peripheral_mock removeAllServices];
   [peripheral_mock addServices:services];
   [peripheral_mock didDiscoverWithError:nil];
 }
 
 void BluetoothTestMac::SimulateGattServiceRemoved(
@@ skipping 52 matching lines @@
 //     crypto::SHA256HashString(input_str, raw, sizeof(raw));
 //     if (base::HexEncode(raw, sizeof(raw)) == target) {
 //       return input_str;
 //     }
 //     ++input[0];
 //   }
 //   return "";
 // }
 
 }  // namespace device