Manage HidService lifetime in DeviceClient implementations.

device/hid/hid_connection_unittest.cc

 // Copyright (c) 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 135 matching lines @@
 
 class HidConnectionTest : public testing::Test {
  protected:
   void SetUp() override {
     if (!UsbTestGadget::IsTestEnabled()) return;
 
     message_loop_.reset(new base::MessageLoopForUI());
     io_thread_.reset(new base::TestIOThread(base::TestIOThread::kAutoStart));
     device_client_.reset(new TestDeviceClient(io_thread_->task_runner()));
 
-    service_ = HidService::GetInstance(io_thread_->task_runner());
+    service_ = DeviceClient::Get()->GetHidService();
     ASSERT_TRUE(service_);
 
     test_gadget_ = UsbTestGadget::Claim(io_thread_->task_runner());
     ASSERT_TRUE(test_gadget_);
     ASSERT_TRUE(test_gadget_->SetType(UsbTestGadget::HID_ECHO));
 
     DeviceCatcher device_catcher(service_,
                                  test_gadget_->GetDevice()->serial_number());
     device_id_ = device_catcher.WaitForDevice();
     ASSERT_NE(device_id_, kInvalidHidDeviceId);
@@ skipping 34 matching lines @@
     ASSERT_EQ(0, read_callback.buffer()->data()[0]);
     for (unsigned char j = 1; j < kBufferSize; ++j) {
       ASSERT_EQ(i + j - 1, read_callback.buffer()->data()[j]);
     }
   }
 
   conn->Close();
 }
 
 }  // namespace device