Create shared MockDeviceClient and MockHidService classes.

Both of these classes are redefined in multiple tests (and more tests I
have out for review) so this change unifies the definitions.

BUG=None

Review URL: https://codereview.chromium.org/1462793003

Cr-Commit-Position: refs/heads/master@{#361419}

1 files changed, 15 insertions, 34 deletions

diff --git a/device/devices_app/usb/device_manager_impl_unittest.cc b/device/devices_app/usb/device_manager_impl_unittest.cc
index ca7e0bd..6ab03f6 100644
--- a/device/devices_app/usb/device_manager_impl_unittest.cc
+++ b/device/devices_app/usb/device_manager_impl_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
-#include "device/core/device_client.h"
+#include "device/core/mock_device_client.h"
 #include "device/devices_app/usb/device_impl.h"
 #include "device/devices_app/usb/device_manager_impl.h"
 #include "device/devices_app/usb/fake_permission_provider.h"
@@ -28,32 +28,12 @@ namespace usb {
 
 namespace {
 
-class TestDeviceClient : public DeviceClient {
- public:
-  TestDeviceClient() {}
-  ~TestDeviceClient() override {}
-
-  MockUsbService& mock_usb_service() { return mock_usb_service_; }
-
- private:
-  // DeviceClient implementation:
-  UsbService* GetUsbService() override { return &mock_usb_service_; }
-
-  MockUsbService mock_usb_service_;
-};
-
 class USBDeviceManagerImplTest : public testing::Test {
  public:
-  USBDeviceManagerImplTest()
-      : device_client_(new TestDeviceClient),
-        message_loop_(new base::MessageLoop) {}
+  USBDeviceManagerImplTest() : message_loop_(new base::MessageLoop) {}
   ~USBDeviceManagerImplTest() override {}
 
  protected:
-  MockUsbService& mock_usb_service() {
-    return device_client_->mock_usb_service();
-  }
-
   DeviceManagerPtr ConnectToDeviceManager() {
     PermissionProviderPtr permission_provider;
     permission_provider_.Bind(mojo::GetProxy(&permission_provider));
@@ -63,9 +43,10 @@ class USBDeviceManagerImplTest : public testing::Test {
     return device_manager.Pass();
   }
 
+  MockDeviceClient device_client_;
+
  private:
   FakePermissionProvider permission_provider_;
-  scoped_ptr<TestDeviceClient> device_client_;
   scoped_ptr<base::MessageLoop> message_loop_;
 };
 
@@ -118,9 +99,9 @@ TEST_F(USBDeviceManagerImplTest, GetDevices) {
   scoped_refptr<MockUsbDevice> device2 =
       new MockUsbDevice(0x1234, 0x567a, "ACME", "Frobinator Mk II", "MNOPQR");
 
-  mock_usb_service().AddDevice(device0);
-  mock_usb_service().AddDevice(device1);
-  mock_usb_service().AddDevice(device2);
+  device_client_.usb_service()->AddDevice(device0);
+  device_client_.usb_service()->AddDevice(device1);
+  device_client_.usb_service()->AddDevice(device2);
 
   DeviceManagerPtr device_manager = ConnectToDeviceManager();
 
@@ -147,7 +128,7 @@ TEST_F(USBDeviceManagerImplTest, GetDevice) {
   scoped_refptr<MockUsbDevice> mock_device =
       new MockUsbDevice(0x1234, 0x5678, "ACME", "Frobinator", "ABCDEF");
 
-  mock_usb_service().AddDevice(mock_device);
+  device_client_.usb_service()->AddDevice(mock_device);
 
   DeviceManagerPtr device_manager = ConnectToDeviceManager();
 
@@ -181,7 +162,7 @@ TEST_F(USBDeviceManagerImplTest, GetDeviceChanges) {
   scoped_refptr<MockUsbDevice> device3 =
       new MockUsbDevice(0x1234, 0x567b, "ACME", "Frobinator Xtreme", "STUVWX");
 
-  mock_usb_service().AddDevice(device0);
+  device_client_.usb_service()->AddDevice(device0);
 
   DeviceManagerPtr device_manager = ConnectToDeviceManager();
 
@@ -197,9 +178,9 @@ TEST_F(USBDeviceManagerImplTest, GetDeviceChanges) {
     loop.Run();
   }
 
-  mock_usb_service().AddDevice(device1);
-  mock_usb_service().AddDevice(device2);
-  mock_usb_service().RemoveDevice(device1);
+  device_client_.usb_service()->AddDevice(device1);
+  device_client_.usb_service()->AddDevice(device2);
+  device_client_.usb_service()->RemoveDevice(device1);
 
   {
     std::set<std::string> added_guids;
@@ -212,9 +193,9 @@ TEST_F(USBDeviceManagerImplTest, GetDeviceChanges) {
     loop.Run();
   }
 
-  mock_usb_service().RemoveDevice(device0);
-  mock_usb_service().RemoveDevice(device2);
-  mock_usb_service().AddDevice(device3);
+  device_client_.usb_service()->RemoveDevice(device0);
+  device_client_.usb_service()->RemoveDevice(device2);
+  device_client_.usb_service()->AddDevice(device3);
 
   {
     std::set<std::string> added_guids;