device/bluetooth: Remove BluetoothAdapter::Start|StopDiscovering.

device/bluetooth/bluetooth_adapter.cc

 // Copyright (c) 2012 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.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
@@ skipping 11 matching lines @@
 void BluetoothAdapter::StartDiscoverySession(
     const DiscoverySessionCallback& callback,
     const ErrorCallback& error_callback) {
   AddDiscoverySession(
       base::Bind(&BluetoothAdapter::OnStartDiscoverySession,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback),
       error_callback);
 }
 
-void BluetoothAdapter::StartDiscovering(const base::Closure& callback,
-                                        const ErrorCallback& error_callback) {
-  AddDiscoverySession(callback, error_callback);
-}
-
-void BluetoothAdapter::StopDiscovering(const base::Closure& callback,
-                                       const ErrorCallback& error_callback) {
-  RemoveDiscoverySession(callback, error_callback);
-}
-
 BluetoothAdapter::DeviceList BluetoothAdapter::GetDevices() {
   ConstDeviceList const_devices =
     const_cast<const BluetoothAdapter *>(this)->GetDevices();
 
   DeviceList devices;
   for (ConstDeviceList::const_iterator i = const_devices.begin();
        i != const_devices.end(); ++i)
     devices.push_back(const_cast<BluetoothDevice *>(*i));
 
   return devices;
@@ skipping 65 matching lines @@
   discovery_sessions_.insert(discovery_session.get());
   callback.Run(discovery_session.Pass());
 }
 
 void BluetoothAdapter::MarkDiscoverySessionsAsInactive() {
   for (std::set<BluetoothDiscoverySession*>::iterator
           iter = discovery_sessions_.begin();
        iter != discovery_sessions_.end(); ++iter) {
     (*iter)->MarkAsInactive();
   }
+  // At this point, all sessions have been marked as inactive. Just remove them
+  // from our list as they are no longer relevant.
+  discovery_sessions_.clear();

[keybuk, 2014/03/06 18:42:36]

This seems to contradict the comment in the header that says that the
DiscoverySession will remove itself from the list when destroyed

[armansito, 2014/03/06 23:55:48]

Well, it doesn't really contradict it, as discovery sessions still remove
themselves. Here I clear the list as an optimization as they are really no
longer needed to be kept in the adapter's list. The comment in the header is
mostly to justify keeping raw pointers as opposed to weak pointers. I can update
the comment though, if you think that should be clarified further.

[keybuk, 2014/03/06 23:57:39]

because we're dealing with object lifetime, I think it should be clear

e.g. note that the list only contains ACTIVE discovery sessions, that they're
removed from the list when made inactive, and also removed when deleted

[armansito, 2014/03/07 19:22:16]

Actually they weren't removed when an individual one became active, but when all
of them collective got marked as inactive. I decided to change the logic so that
only pointers to active sessions are kept in |discovery_sessions_| and updated
the comments to reflect this.

 }
 
 void BluetoothAdapter::DiscoverySessionDestroyed(
     BluetoothDiscoverySession* discovery_session) {
   discovery_sessions_.erase(discovery_session);
 }
 
 }  // namespace device