Preparing for characteristics discovery

device/bluetooth/test/mock_bluetooth_cbperipheral_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/mock_bluetooth_cbperipheral_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "device/bluetooth/test/bluetooth_test_mac.h"
 #include "device/bluetooth/test/mock_bluetooth_cbservice_mac.h"
@@ skipping 27 matching lines @@
   return [self initWithIdentifier:identifier name:nil];
 }
 
 - (instancetype)initWithIdentifier:(NSUUID*)identifier {
   return [self initWithIdentifier:identifier name:nil];
 }
 
 - (instancetype)initWithIdentifier:(NSUUID*)identifier name:(NSString*)name {
   self = [super init];
   if (self) {
-    _services.reset([[NSMutableArray alloc] init]);
     _identifier.reset([identifier retain]);
     if (name) {
       _name.reset([name retain]);
     } else {
       _name.reset(
           [@(device::BluetoothTestBase::kTestDeviceName.c_str()) retain]);
     }
     _state = CBPeripheralStateDisconnected;
   }
   return self;
@@ skipping 10 matching lines @@
 - (BOOL)isMemberOfClass:(Class)aClass {
   if (aClass == [CBPeripheral class] ||
       [aClass isSubclassOfClass:[CBPeripheral class]]) {
     return YES;
   }
   return [super isKindOfClass:aClass];
 }
 
 - (void)setState:(CBPeripheralState)state {
   _state = state;
+  if (_state == CBPeripheralStateDisconnected) {
+    _services = nil;
+  }
 }
 
 - (void)discoverServices:(NSArray*)serviceUUIDs {
   if (_bluetoothTestMac) {
     _bluetoothTestMac->OnFakeBluetoothServiceDiscovery();
   }
 }
 
 - (void)removeAllServices {
   [_services.get() removeAllObjects];
 }
 
 - (void)addServices:(NSArray*)services {
+  if (!_services.get()) {
+    _services.reset([[NSMutableArray alloc] init]);
+  }
   for (CBUUID* uuid in services) {
     base::scoped_nsobject<MockCBService> service(
         [[MockCBService alloc] initWithCBUUID:uuid primary:YES]);
     [_services.get() addObject:service.get().service];
   }
 }
 
-- (void)didDiscoverWithError:(NSError*)error {
+- (void)didDiscoverServicesWithError:(NSError*)error {
   [_delegate peripheral:self.peripheral didDiscoverServices:error];
 }
 
 - (void)removeService:(CBService*)service {
   base::scoped_nsobject<CBService> serviceToRemove(service,
                                                    base::scoped_policy::RETAIN);
   DCHECK(serviceToRemove);
   [_services.get() removeObject:serviceToRemove];
   // -[CBPeripheralDelegate peripheral:didModifyServices:] is only available
   // with 10.9. It is safe to call this method (even if chrome is running on
@@ skipping 16 matching lines @@
 
 - (NSArray*)services {
   return _services.get();
 }
 
 - (CBPeripheral*)peripheral {
   return ObjCCast<CBPeripheral>(self);
 }
 
 @end