Remove the HidService reference outside //device.

HidService will be internal of device service, so remove all references that outside of //device. BUG=728223 Change-Id: I9e89c45db947f59d92c3f4a36f1317222b86b5d7 Reviewed-on: https://chromium-review.googlesource.com/700618 Commit-Queue: Ke He <ke.he@intel.com> Reviewed-by: Reilly Grant <reillyg@chromium.org> Cr-Commit-Position: refs/heads/master@{#506654}
FairyWorld · Oct 5, 2017 · aee462c · aee462c
1 parent 7f5c4e1
commit aee462c
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 97 deletions.
diff --git a/chrome/browser/chrome_device_client.cc b/chrome/browser/chrome_device_client.cc
@@ -7,10 +7,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "device/usb/usb_service.h"
 
-#if !defined(OS_ANDROID)
-#include "device/hid/hid_service.h"
-#endif  // !defined(OS_ANDROID)
-
 using content::BrowserThread;
 
 ChromeDeviceClient::ChromeDeviceClient() = default;
@@ -23,12 +19,3 @@ device::UsbService* ChromeDeviceClient::GetUsbService() {
     usb_service_ = device::UsbService::Create();
   return usb_service_.get();
 }
-
-#if !defined(OS_ANDROID)
-device::HidService* ChromeDeviceClient::GetHidService() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!hid_service_)
-    hid_service_ = device::HidService::Create();
-  return hid_service_.get();
-}
-#endif  // defined(OS_ANDROID)
diff --git a/chrome/browser/chrome_device_client.h b/chrome/browser/chrome_device_client.h
@@ -21,15 +21,8 @@ class ChromeDeviceClient : device::DeviceClient {
 
   // device::DeviceClient implementation
   device::UsbService* GetUsbService() override;
-#if !defined(OS_ANDROID)
-  device::HidService* GetHidService() override;
-#endif  // !defined(OS_ANDROID)
 
  private:
-#if !defined(OS_ANDROID)
-  std::unique_ptr<device::HidService> hid_service_;
-#endif  // !defined(OS_ANDROID)
-
   std::unique_ptr<device::UsbService> usb_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDeviceClient);

diff --git a/device/base/device_client.cc b/device/base/device_client.cc
@@ -34,10 +34,4 @@ UsbService* DeviceClient::GetUsbService() {
   return nullptr;
 }
 
-HidService* DeviceClient::GetHidService() {
-  // This should never be called by clients which do not support the HID API.
-  NOTREACHED();
-  return nullptr;
-}
-
 }  // namespace device
diff --git a/device/base/device_client.h b/device/base/device_client.h
@@ -10,7 +10,6 @@
 
 namespace device {
 
-class HidService;
 class UsbService;
 
 // Interface used by consumers of //device APIs to get pointers to the service
@@ -30,9 +29,6 @@ class DEVICE_BASE_EXPORT DeviceClient {
   // Returns the UsbService instance for this embedder.
   virtual UsbService* GetUsbService();
 
-  // Returns the HidService instance for this embedder.
-  virtual HidService* GetHidService();
-
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceClient);
 };

diff --git a/device/base/mock_device_client.cc b/device/base/mock_device_client.cc
@@ -4,25 +4,14 @@
 
 #include "device/base/mock_device_client.h"
 
-#include "base/logging.h"
 #include "device/usb/mock_usb_service.h"
 
-#if !defined(OS_ANDROID)
-#include "device/hid/mock_hid_service.h"
-#endif
-
 namespace device {
 
 MockDeviceClient::MockDeviceClient() {}
 
 MockDeviceClient::~MockDeviceClient() {}
 
-#if !defined(OS_ANDROID)
-HidService* MockDeviceClient::GetHidService() {
-  return hid_service();
-}
-#endif
-
 UsbService* MockDeviceClient::GetUsbService() {
   return usb_service();
 }
@@ -33,12 +22,4 @@ MockUsbService* MockDeviceClient::usb_service() {
   return usb_service_.get();
 }
 
-#if !defined(OS_ANDROID)
-MockHidService* MockDeviceClient::hid_service() {
-  if (!hid_service_)
-    hid_service_.reset(new MockHidService());
-  return hid_service_.get();
-}
-#endif
-
 }  // namespace device
diff --git a/device/base/mock_device_client.h b/device/base/mock_device_client.h
@@ -12,7 +12,6 @@
 
 namespace device {
 
-class MockHidService;
 class MockUsbService;
 
 class MockDeviceClient : device::DeviceClient {
@@ -22,20 +21,11 @@ class MockDeviceClient : device::DeviceClient {
 
   // device::DeviceClient implementation:
   UsbService* GetUsbService() override;
-#if !defined(OS_ANDROID)
-  HidService* GetHidService() override;
-#endif
 
   // Accessors for the mock instances.
   MockUsbService* usb_service();
-#if !defined(OS_ANDROID)
-  MockHidService* hid_service();
-#endif
 
  private:
-#if !defined(OS_ANDROID)
-  std::unique_ptr<MockHidService> hid_service_;
-#endif
   std::unique_ptr<MockUsbService> usb_service_;
 };
 

diff --git a/device/hid/hid_connection_unittest.cc b/device/hid/hid_connection_unittest.cc
@@ -19,7 +19,6 @@
 #include "base/test/test_io_thread.h"
 #include "device/hid/hid_service.h"
 #include "device/hid/public/interfaces/hid.mojom.h"
-#include "device/test/test_device_client.h"
 #include "device/test/usb_test_gadget.h"
 #include "device/usb/usb_device.h"
 #include "net/base/io_buffer.h"
@@ -159,23 +158,22 @@ class HidConnectionTest : public testing::Test {
   void SetUp() override {
     if (!UsbTestGadget::IsTestEnabled()) return;
 
-    service_ = DeviceClient::Get()->GetHidService();
+    service_ = HidService::Create();
     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_,
+    DeviceCatcher device_catcher(service_.get(),
                                  test_gadget_->GetDevice()->serial_number());
     device_guid_ = device_catcher.WaitForDevice();
     ASSERT_FALSE(device_guid_.empty());
   }
 
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   base::TestIOThread io_thread_;
-  TestDeviceClient device_client_;
-  HidService* service_;
+  std::unique_ptr<HidService> service_;
   std::unique_ptr<UsbTestGadget> test_gadget_;
   std::string device_guid_;
 };

diff --git a/device/hid/hid_service_unittest.cc b/device/hid/hid_service_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "device/hid/public/interfaces/hid.mojom.h"
-#include "device/test/test_device_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device {
@@ -20,9 +19,9 @@ class HidServiceTest : public ::testing::Test {
       : scoped_task_environment_(
             base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
- private:
+ protected:
   base::test::ScopedTaskEnvironment scoped_task_environment_;
-  TestDeviceClient device_client_;
+  std::unique_ptr<HidService> service_;
 };
 
 void OnGetDevices(const base::Closure& quit_closure,
@@ -36,13 +35,12 @@ void OnGetDevices(const base::Closure& quit_closure,
 }  // namespace
 
 TEST_F(HidServiceTest, GetDevices) {
-  // The HID service is not available on all platforms.
-  HidService* service = DeviceClient::Get()->GetHidService();
-  if (service) {
-    base::RunLoop loop;
-    service->GetDevices(base::Bind(&OnGetDevices, loop.QuitClosure()));
-    loop.Run();
-  }
+  service_ = HidService::Create();
+  ASSERT_TRUE(service_);
+
+  base::RunLoop loop;
+  service_->GetDevices(base::Bind(&OnGetDevices, loop.QuitClosure()));
+  loop.Run();
 }
 
 }  // namespace device
diff --git a/device/test/test_device_client.cc b/device/test/test_device_client.cc
@@ -7,24 +7,12 @@
 #include "base/single_thread_task_runner.h"
 #include "device/usb/usb_service.h"
 
-#if !defined(OS_ANDROID)
-#include "device/hid/hid_service.h"
-#endif
-
 namespace device {
 
 TestDeviceClient::TestDeviceClient() = default;
 
 TestDeviceClient::~TestDeviceClient() = default;
 
-#if !defined(OS_ANDROID)
-HidService* TestDeviceClient::GetHidService() {
-  if (!hid_service_)
-    hid_service_ = HidService::Create();
-  return hid_service_.get();
-}
-#endif
-
 UsbService* TestDeviceClient::GetUsbService() {
   if (!usb_service_)
     usb_service_ = UsbService::Create();

diff --git a/device/test/test_device_client.h b/device/test/test_device_client.h
@@ -9,7 +9,6 @@
 
 namespace device {
 
-class HidService;
 class UsbService;
 
 class TestDeviceClient : public DeviceClient {
@@ -19,15 +18,9 @@ class TestDeviceClient : public DeviceClient {
   // Must be destroyed when tasks can still be posted to |task_runner|.
   ~TestDeviceClient() override;
 
-#if !defined(OS_ANDROID)
-  HidService* GetHidService() override;
-#endif
   UsbService* GetUsbService() override;
 
  private:
-#if !defined(OS_ANDROID)
-  std::unique_ptr<HidService> hid_service_;
-#endif
   std::unique_ptr<UsbService> usb_service_;
 };
 

diff --git a/extensions/browser/api/device_permissions_manager.cc b/extensions/browser/api/device_permissions_manager.cc
@@ -31,7 +31,6 @@ namespace extensions {
 
 using content::BrowserContext;
 using content::BrowserThread;
-using device::HidService;
 using device::UsbDevice;
 using device::UsbService;
 using extensions::APIPermission;

diff --git a/extensions/browser/api/device_permissions_manager.h b/extensions/browser/api/device_permissions_manager.h
@@ -20,7 +20,6 @@
 #include "base/threading/thread_checker.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "device/hid/hid_service.h"
 #include "device/hid/public/interfaces/hid.mojom.h"
 #include "device/usb/usb_service.h"
 

diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc
@@ -30,7 +30,6 @@
 namespace hid = extensions::api::hid;
 
 using device::HidDeviceFilter;
-using device::HidService;
 
 namespace extensions {
 

diff --git a/extensions/shell/browser/shell_device_client.cc b/extensions/shell/browser/shell_device_client.cc
@@ -5,7 +5,6 @@
 #include "extensions/shell/browser/shell_device_client.h"
 
 #include "content/public/browser/browser_thread.h"
-#include "device/hid/hid_service.h"
 #include "device/usb/usb_service.h"
 
 using content::BrowserThread;