[device-enumeration] Add goldfish-sensor device.

This makes sure that the goldfish-sensor device is created
and the driver is correctly bound.

Change-Id: Ia6d5d028c6b991175b36a7a70dab03130faa7dac
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/556166
Commit-Queue: Yilong Li <liyl@google.com>
Reviewed-by: Suraj Malhotra <surajmalhotra@google.com>
diff --git a/src/ui/input/drivers/goldfish_sensor/tests/root_device_test.cc b/src/ui/input/drivers/goldfish_sensor/tests/root_device_test.cc
index da491a9..8c4ab6f 100644
--- a/src/ui/input/drivers/goldfish_sensor/tests/root_device_test.cc
+++ b/src/ui/input/drivers/goldfish_sensor/tests/root_device_test.cc
@@ -37,7 +37,7 @@
             [rootdevice](InputDevice* dev) { rootdevice->input_devices()->RemoveDevice(dev); }),
         name_(name) {}
 
-  virtual ~FakeInputDevice() { g_devices_.erase(name_); }
+  ~FakeInputDevice() override { g_devices_.erase(name_); }
 
   zx_status_t OnReport(const SensorReport& rpt) override {
     std::vector<double> new_report;
diff --git a/zircon/system/utest/device-enumeration/main.cc b/zircon/system/utest/device-enumeration/main.cc
index e7f9287..b109455 100644
--- a/zircon/system/utest/device-enumeration/main.cc
+++ b/zircon/system/utest/device-enumeration/main.cc
@@ -619,6 +619,8 @@
       // Verify goldfish pipe child devices created.
       "sys/platform/acpi/acpi-_SB_/acpi-GFPP/goldfish-pipe/goldfish-pipe-control",
       "sys/platform/acpi/acpi-_SB_/acpi-GFPP/goldfish-pipe/goldfish-pipe-sensor",
+      // Verify goldfish-sensor root device is created.
+      "sys/platform/acpi/acpi-_SB_/acpi-GFPP/goldfish-pipe/goldfish-pipe-sensor/goldfish-sensor",
       "sys/platform/acpi/acpi-_SB_/acpi-GFSK",
       "sys/platform/acpi/acpi-_SB_/acpi-GFSK/goldfish-sync",