Enable more unittests for BlueZ and ChromeOS.

device/bluetooth/test/bluetooth_test_bluez.cc

 // 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_bluez.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 48 matching lines @@
 
 BluetoothTestBlueZ::BluetoothTestBlueZ()
     : fake_bluetooth_device_client_(nullptr) {}
 
 BluetoothTestBlueZ::~BluetoothTestBlueZ() {}
 
 void BluetoothTestBlueZ::SetUp() {
   BluetoothTestBase::SetUp();
   std::unique_ptr<bluez::BluezDBusManagerSetter> dbus_setter =
       bluez::BluezDBusManager::GetSetterForTesting();
+
+  fake_bluetooth_adapter_client_ = new bluez::FakeBluetoothAdapterClient;
+  dbus_setter->SetBluetoothAdapterClient(
+      std::unique_ptr<bluez::BluetoothAdapterClient>(
+          fake_bluetooth_adapter_client_));
+
   fake_bluetooth_device_client_ = new bluez::FakeBluetoothDeviceClient;
   dbus_setter->SetBluetoothDeviceClient(
       std::unique_ptr<bluez::BluetoothDeviceClient>(
           fake_bluetooth_device_client_));
+
+  // Make the fake adapter post tasks without delay in order to avoid timing
+  // issues.
+  fake_bluetooth_adapter_client_->SetSimulationIntervalMs(0);
 }
 
 void BluetoothTestBlueZ::TearDown() {
+  for (const auto& connection : gatt_connections_) {

[ortuno, 2017/01/22 20:51:55]

A comment explaining why we need to close all connections and active sessions
would be nice.

[perja, 2017/01/23 09:05:34]

Done.

+    if (connection->IsConnected())
+      connection->Disconnect();
+  }
+  gatt_connections_.clear();
+
+  for (const auto& session : discovery_sessions_) {
+    if (session->IsActive())
+      session->Stop(base::Bind(&base::DoNothing), base::Bind(&base::DoNothing));
+  }
+  discovery_sessions_.clear();
+
   adapter_ = nullptr;
   bluez::BluezDBusManager::Shutdown();
   BluetoothTestBase::TearDown();
 }
 
 bool BluetoothTestBlueZ::PlatformSupportsLowEnergy() {
   return true;
 }
 
 void BluetoothTestBlueZ::InitWithFakeAdapter() {
   base::RunLoop run_loop;
   adapter_ = new bluez::BluetoothAdapterBlueZ(
       base::Bind(&AdapterCallback, run_loop.QuitClosure()));
   run_loop.Run();
+  adapter_->SetPowered(true, base::Bind(&base::DoNothing),
+                       base::Bind(&base::DoNothing));
 }
 
 BluetoothDevice* BluetoothTestBlueZ::SimulateLowEnergyDevice(
     int device_ordinal) {
   if (device_ordinal > 6 || device_ordinal < 1)
     return nullptr;
 
   base::Optional<std::string> device_name = kTestDeviceName;
   std::string device_address = kTestDeviceAddress1;
   std::vector<std::string> service_uuids;
@@ skipping 217 matching lines @@
   std::vector<BluetoothLocalGattService*> services;
   bluez::BluetoothAdapterBlueZ* adapter_bluez =
       static_cast<bluez::BluetoothAdapterBlueZ*>(adapter_.get());
 
   for (const auto& iter : adapter_bluez->registered_gatt_services_)
     services.push_back(iter.second);
   return services;
 }
 
 }  // namespace device