Reduce FakeArcBridgeService usage.

components/arc/bluetooth/arc_bluetooth_bridge_unittest.cc

 // Copyright 2016 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 "components/arc/bluetooth/arc_bluetooth_bridge.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
+#include "components/arc/arc_bridge_service.h"
 #include "components/arc/bluetooth/bluetooth_type_converters.h"
 #include "components/arc/common/bluetooth.mojom.h"
-#include "components/arc/test/fake_arc_bridge_service.h"
 #include "components/arc/test/fake_bluetooth_instance.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_device_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_service_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 55 matching lines @@
     fake_bluetooth_device_client->RemoveAllDevices();
     dbus_setter->SetBluetoothDeviceClient(
         std::move(fake_bluetooth_device_client));
     dbus_setter->SetBluetoothGattServiceClient(
         base::MakeUnique<bluez::FakeBluetoothGattServiceClient>());
     dbus_setter->SetBluetoothGattCharacteristicClient(
         base::MakeUnique<bluez::FakeBluetoothGattCharacteristicClient>());
     dbus_setter->SetBluetoothGattDescriptorClient(
         base::MakeUnique<bluez::FakeBluetoothGattDescriptorClient>());
 
-    fake_arc_bridge_service_.reset(new FakeArcBridgeService());
-    fake_bluetooth_instance_.reset(new FakeBluetoothInstance());
-    fake_arc_bridge_service_->bluetooth()->SetInstance(
+    arc_bridge_service_ = base::MakeUnique<ArcBridgeService>();
+    fake_bluetooth_instance_ = base::MakeUnique<FakeBluetoothInstance>();
+    arc_bridge_service_->bluetooth()->SetInstance(
         fake_bluetooth_instance_.get(), 2);
-    arc_bluetooth_bridge_.reset(
-        new ArcBluetoothBridge(fake_arc_bridge_service_.get()));
+    arc_bluetooth_bridge_ =
+        base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service_.get());
 
     device::BluetoothAdapterFactory::GetAdapter(base::Bind(
         &ArcBluetoothBridgeTest::OnAdapterInitialized, base::Unretained(this)));
     // We will quit the loop once we get the adapter.
     get_adapter_run_loop_.Run();
   }
 
   // Helper methods for multi advertisement tests.
   int32_t ReserveAdvertisementHandle() {
     constexpr int kSentinelHandle = -2;
@@ skipping 51 matching lines @@
     bluez::FakeBluetoothLEAdvertisingManagerClient* adv_client =
         static_cast<bluez::FakeBluetoothLEAdvertisingManagerClient*>(
             bluez::BluezDBusManager::Get()
                 ->GetBluetoothLEAdvertisingManagerClient());
     return adv_client->currently_registered();
   }
 
   int last_adv_handle_;
   mojom::BluetoothGattStatus last_status_;
 
-  std::unique_ptr<FakeArcBridgeService> fake_arc_bridge_service_;
+  std::unique_ptr<ArcBridgeService> arc_bridge_service_;
   std::unique_ptr<FakeBluetoothInstance> fake_bluetooth_instance_;
   std::unique_ptr<ArcBluetoothBridge> arc_bluetooth_bridge_;
   scoped_refptr<device::BluetoothAdapter> adapter_;
   base::MessageLoop message_loop_;
   base::RunLoop get_adapter_run_loop_;
 };
 
 // When we add device to bluez::FakeBluetoothDeviceClient, ArcBluetoothBridge
 // should send new device data to Android. This test will then check
 // the correctness of the device properties sent via arc bridge.
@@ skipping 142 matching lines @@
       BroadcastAdvertisement(handle, std::move(adv_data));
   EXPECT_EQ(mojom::BluetoothGattStatus::GATT_SUCCESS, status);
   EXPECT_EQ(1, NumActiveAdvertisements());
 
   status = ReleaseAdvertisementHandle(handle);
   EXPECT_EQ(mojom::BluetoothGattStatus::GATT_SUCCESS, status);
   EXPECT_EQ(0, NumActiveAdvertisements());
 }
 
 }  // namespace arc