Ports VRService to be hosted in the device service.

services/device/device_service.h

Index: services/device/device_service.h
diff --git a/services/device/device_service.h b/services/device/device_service.h
index cea6c11f23dcb61ea573c6b5bb50b95de4b73274..be6c7475410e281e5e9e7599b1ebcdfc4660a1e3 100644
--- a/services/device/device_service.h
+++ b/services/device/device_service.h
@@ -11,6 +11,10 @@
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 
+#if defined(ENABLE_WEBVR)
+#include "device/vr/vr_service.mojom.h"  //nogncheck
+#endif
+
 namespace device {
 
 class TimeZoneMonitor;
@@ -20,7 +24,12 @@ std::unique_ptr<service_manager::Service> CreateDeviceService(
 
 class DeviceService
     : public service_manager::Service,
-      public service_manager::InterfaceFactory<mojom::TimeZoneMonitor> {
+      public service_manager::InterfaceFactory<mojom::TimeZoneMonitor>
+#if defined(ENABLE_WEBVR)
+      ,
+      public service_manager::InterfaceFactory<mojom::VRService>
+#endif
+{
  public:
   DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
   ~DeviceService() override;
@@ -35,6 +44,12 @@ class DeviceService
   void Create(const service_manager::Identity& remote_identity,
               mojom::TimeZoneMonitorRequest request) override;
 
+#if defined(ENABLE_WEBVR)
+  // InterfaceFactory<mojom::VRService>:
+  void Create(const service_manager::Identity& remote_identity,
+              mojom::VRServiceRequest request) override;
+#endif
+
   std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_;
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;