Set OpenVR gamepad.id to 'htc-vive' if the model string contains 'Vive'.

OpenVR reports different model strings for developer vs released versions
of Vive controllers. In the future, there could be additional iterations
of the Vive controller that we also want to catch here. That's why we
check if the model string contains "Vive" instead of doing an exact match
against specific string(s).

Bug: 961862
Change-Id: I18892434c58e396a3f60f239d645e96226f4b498
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1622465
Reviewed-by: Bill Orr <billorr@chromium.org>
Commit-Queue: Jacob DeWitt <jacde@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661818}

device/vr/openvr/openvr_gamepad_helper.cc

@@ -316,7 +316,13 @@ class OpenVRGamepadBuilder : public GamepadBuilder {
         GetOpenVRString(vr_system, vr::Prop_ModelNumber_String, controller_id);
     std::string manufacturer = GetOpenVRString(
         vr_system, vr::Prop_ManufacturerName_String, controller_id);
-    return (model == "Vive Controller MV") && (manufacturer == "HTC");
+
+    // OpenVR reports different model strings for developer vs released versions
+    // of Vive controllers. In the future, there could be additional iterations
+    // of the Vive controller that we also want to catch here. That's why we
+    // check if the model string contains "Vive" instead of doing an exact match
+    // against specific string(s).
+    return (manufacturer == "HTC") && (model.find("Vive") != std::string::npos);
   }
 
   // TODO(https://crbug.com/942201): Get correct ID string once WebXR spec issue