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

device/bluetooth/bluetooth_discovery_session.cc

 // Copyright 2014 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_discovery_session.h"
 
 #include "base/bind.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 namespace device {
 
 BluetoothDiscoverySession::BluetoothDiscoverySession(
     scoped_refptr<BluetoothAdapter> adapter)
     : active_(true),
       adapter_(adapter),
       weak_ptr_factory_(this) {
   DCHECK(adapter_.get());
 }
 
 BluetoothDiscoverySession::BluetoothDiscoverySession()
     : active_(false),
       weak_ptr_factory_(this) {
 }
 
 BluetoothDiscoverySession::~BluetoothDiscoverySession() {
-  if (!active_)
+  // |adapter_| may be NULL if this instance was initialized as a mock.
+  if (!adapter_.get()) {
+    DCHECK(!active_);
     return;
-  DCHECK(adapter_.get());
+  }
   Stop(base::Bind(&base::DoNothing), base::Bind(&base::DoNothing));
   adapter_->DiscoverySessionDestroyed(this);
 }
 
 bool BluetoothDiscoverySession::IsActive() const {
   return active_;
 }
 
 void BluetoothDiscoverySession::Stop(
     const base::Closure& callback,
@@ skipping 15 matching lines @@
 void BluetoothDiscoverySession::OnStop(const base::Closure& callback) {
   active_ = false;
   callback.Run();
 }
 
 void BluetoothDiscoverySession::MarkAsInactive() {
   active_ = false;
 }
 
 }  // namespace device