Privatize StrongBinding lifetime management

device/serial/serial_service_unittest.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 <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "device/serial/serial.mojom.h"
 #include "device/serial/serial_service_impl.h"
 #include "device/serial/test_serial_io_handler.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device {
 namespace {
 
 class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
   mojo::Array<serial::DeviceInfoPtr> GetDevices() override {
     mojo::Array<serial::DeviceInfoPtr> devices(1);
     devices[0] = serial::DeviceInfo::New();
     devices[0]->path = "device";
@@ skipping 43 matching lines @@
     connected_ = true;
     StopMessageLoop();
   }
 
   scoped_refptr<SerialIoHandler> ReturnIoHandler() { return io_handler_; }
 
   void RunConnectTest(const std::string& path, bool expecting_success) {
     if (!io_handler_.get())
       io_handler_ = new TestSerialIoHandler;
     mojo::InterfacePtr<serial::SerialService> service;
-    new SerialServiceImpl(
-        new SerialConnectionFactory(
-            base::Bind(&SerialServiceTest::ReturnIoHandler,
-                       base::Unretained(this)),
-            base::ThreadTaskRunnerHandle::Get()),
-        std::unique_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator),
+    mojo::MakeStrongBinding(
+        base::MakeUnique<SerialServiceImpl>(
+            new SerialConnectionFactory(
+                base::Bind(&SerialServiceTest::ReturnIoHandler,
+                           base::Unretained(this)),
+                base::ThreadTaskRunnerHandle::Get()),
+            base::MakeUnique<FakeSerialDeviceEnumerator>()),
         mojo::GetProxy(&service));
     mojo::InterfacePtr<serial::Connection> connection;
     mojo::InterfacePtr<serial::DataSink> sink;
     mojo::InterfacePtr<serial::DataSource> source;
     mojo::InterfacePtr<serial::DataSourceClient> source_client;
     mojo::GetProxy(&source_client);
     service->Connect(path, serial::ConnectionOptions::New(),
                      mojo::GetProxy(&connection), mojo::GetProxy(&sink),
                      mojo::GetProxy(&source), std::move(source_client));
     connection.set_connection_error_handler(base::Bind(
@@ skipping 41 matching lines @@
 TEST_F(SerialServiceTest, ConnectInvalidPath) {
   RunConnectTest("invalid_path", false);
 }
 
 TEST_F(SerialServiceTest, ConnectOpenFailed) {
   io_handler_ = new FailToOpenIoHandler;
   RunConnectTest("device", false);
 }
 
 }  // namespace device