Refactor OpenVR test class names to be runtime agnostic

Rename two test classes that currently have "OpenVR" in its name. These
classes do not have OpenVR specific implementations and can be
generalized to support other runtimes.

- OpenVRTestHook -> VRTestHook. The file is also moved from
/device/vr/openvr/test to /device/vr/test.
- MockOpenVRDeviceHookBase -> MockVRDeviceHookBase

Change-Id: I7b8ecad096e7c787d39a59fd7308fc25fdc904db
Reviewed-on: https://chromium-review.googlesource.com/c/1479813
Commit-Queue: Patrick To <patrto@microsoft.com>
Reviewed-by: Bill Orr <billorr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636572}

chrome/browser/vr/BUILD.gn

@@ -652,8 +652,8 @@ if (!is_android) {
 
     # Common infrastructure.
     sources = [
-      "test/mock_openvr_device_hook_base.cc",
-      "test/mock_openvr_device_hook_base.h",
+      "test/mock_xr_device_hook_base.cc",
+      "test/mock_xr_device_hook_base.h",
       "test/webvr_browser_test.cc",
       "test/webvr_browser_test.h",
       "test/webxr_browser_test.cc",

chrome/browser/vr/DEPS

@@ -8,7 +8,7 @@ include_rules = [
 
 specific_include_rules = {
   ".*test.*\.cc": [
-    "+device/vr/openvr/test/test_hook.h",
+    "+device/vr/test/test_hook.h",
     "+third_party/openvr/src/headers/openvr.h",
   ],
 }
\ No newline at end of file

chrome/browser/vr/test/DEPS

 include_rules = [
   "+device/vr/openvr/openvr_device_provider.h",
-  "+device/vr/openvr/test/test_hook.h",
+  "+device/vr/test/test_hook.h",
   "+mojo/core/embedder",
 ]

chrome/browser/vr/test/mock_openvr_device_hook_base.cc → chrome/browser/vr/test/mock_xr_device_hook_base.cc

@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/vr/test/mock_openvr_device_hook_base.h"
+#include "chrome/browser/vr/test/mock_xr_device_hook_base.h"
 #include "content/public/common/service_manager_connection.h"
-#include "device/vr/openvr/test/test_hook.h"
 #include "device/vr/public/mojom/isolated_xr_service.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
@@ -49,7 +48,7 @@ device_test::mojom::ControllerFrameDataPtr DeviceToMojoControllerFrameData(
   return ret;
 }
 
-MockOpenVRDeviceHookBase::MockOpenVRDeviceHookBase()
+MockXRDeviceHookBase::MockXRDeviceHookBase()
     : tracked_classes_{device_test::mojom::TrackedDeviceClass::
                            kTrackedDeviceInvalid},
       binding_(this) {
@@ -69,11 +68,11 @@ MockOpenVRDeviceHookBase::MockOpenVRDeviceHookBase()
   test_hook_registration_->SetTestHook(std::move(client));
 }
 
-MockOpenVRDeviceHookBase::~MockOpenVRDeviceHookBase() {
+MockXRDeviceHookBase::~MockXRDeviceHookBase() {
   StopHooking();
 }
 
-void MockOpenVRDeviceHookBase::StopHooking() {
+void MockXRDeviceHookBase::StopHooking() {
   // We don't call test_hook_registration_->SetTestHook(nullptr), since that
   // will potentially deadlock with reentrant or crossing synchronous mojo
   // calls.
@@ -81,13 +80,13 @@ void MockOpenVRDeviceHookBase::StopHooking() {
   test_hook_registration_ = nullptr;
 }
 
-void MockOpenVRDeviceHookBase::OnFrameSubmitted(
+void MockXRDeviceHookBase::OnFrameSubmitted(
     device_test::mojom::SubmittedFrameDataPtr frame_data,
     device_test::mojom::XRTestHook::OnFrameSubmittedCallback callback) {
   std::move(callback).Run();
 }
 
-void MockOpenVRDeviceHookBase::WaitGetDeviceConfig(
+void MockXRDeviceHookBase::WaitGetDeviceConfig(
     device_test::mojom::XRTestHook::WaitGetDeviceConfigCallback callback) {
   device_test::mojom::DeviceConfigPtr ret =
       device_test::mojom::DeviceConfig::New();
@@ -97,21 +96,21 @@ void MockOpenVRDeviceHookBase::WaitGetDeviceConfig(
   std::move(callback).Run(std::move(ret));
 }
 
-void MockOpenVRDeviceHookBase::WaitGetPresentingPose(
+void MockXRDeviceHookBase::WaitGetPresentingPose(
     device_test::mojom::XRTestHook::WaitGetPresentingPoseCallback callback) {
   auto pose = device_test::mojom::PoseFrameData::New();
   pose->device_to_origin = gfx::Transform();
   std::move(callback).Run(std::move(pose));
 }
 
-void MockOpenVRDeviceHookBase::WaitGetMagicWindowPose(
+void MockXRDeviceHookBase::WaitGetMagicWindowPose(
     device_test::mojom::XRTestHook::WaitGetMagicWindowPoseCallback callback) {
   auto pose = device_test::mojom::PoseFrameData::New();
   pose->device_to_origin = gfx::Transform();
   std::move(callback).Run(std::move(pose));
 }
 
-void MockOpenVRDeviceHookBase::WaitGetControllerRoleForTrackedDeviceIndex(
+void MockXRDeviceHookBase::WaitGetControllerRoleForTrackedDeviceIndex(
     unsigned int index,
     device_test::mojom::XRTestHook::
         WaitGetControllerRoleForTrackedDeviceIndexCallback callback) {
@@ -122,7 +121,7 @@ void MockOpenVRDeviceHookBase::WaitGetControllerRoleForTrackedDeviceIndex(
   std::move(callback).Run(role);
 }
 
-void MockOpenVRDeviceHookBase::WaitGetTrackedDeviceClass(
+void MockXRDeviceHookBase::WaitGetTrackedDeviceClass(
     unsigned int index,
     device_test::mojom::XRTestHook::WaitGetTrackedDeviceClassCallback
         callback) {
@@ -130,7 +129,7 @@ void MockOpenVRDeviceHookBase::WaitGetTrackedDeviceClass(
   std::move(callback).Run(tracked_classes_[index]);
 }
 
-void MockOpenVRDeviceHookBase::WaitGetControllerData(
+void MockXRDeviceHookBase::WaitGetControllerData(
     unsigned int index,
     device_test::mojom::XRTestHook::WaitGetControllerDataCallback callback) {
   if (tracked_classes_[index] ==
@@ -148,7 +147,7 @@ void MockOpenVRDeviceHookBase::WaitGetControllerData(
   std::move(callback).Run(DeviceToMojoControllerFrameData(data));
 }
 
-unsigned int MockOpenVRDeviceHookBase::ConnectController(
+unsigned int MockXRDeviceHookBase::ConnectController(
     const device::ControllerFrameData& initial_data) {
   // Find the first open tracked device slot and fill that.
   for (unsigned int i = 0; i < device::kMaxTrackedDevices; ++i) {
@@ -167,7 +166,7 @@ unsigned int MockOpenVRDeviceHookBase::ConnectController(
   return device::kMaxTrackedDevices;
 }
 
-void MockOpenVRDeviceHookBase::UpdateController(
+void MockXRDeviceHookBase::UpdateController(
     unsigned int index,
     const device::ControllerFrameData& updated_data) {
   auto iter = controller_data_map_.find(index);
@@ -175,7 +174,7 @@ void MockOpenVRDeviceHookBase::UpdateController(
   iter->second = updated_data;
 }
 
-void MockOpenVRDeviceHookBase::DisconnectController(unsigned int index) {
+void MockXRDeviceHookBase::DisconnectController(unsigned int index) {
   DCHECK(tracked_classes_[index] ==
          device_test::mojom::TrackedDeviceClass::kTrackedDeviceController);
   auto iter = controller_data_map_.find(index);
@@ -185,7 +184,7 @@ void MockOpenVRDeviceHookBase::DisconnectController(unsigned int index) {
       device_test::mojom::TrackedDeviceClass::kTrackedDeviceInvalid;
 }
 
-device::ControllerFrameData MockOpenVRDeviceHookBase::CreateValidController(
+device::ControllerFrameData MockXRDeviceHookBase::CreateValidController(
     device::ControllerRole role) {
   device::ControllerFrameData ret;
   // Because why shouldn't a 64 button controller exist?

chrome/browser/vr/test/mock_openvr_device_hook_base.h → chrome/browser/vr/test/mock_xr_device_hook_base.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_VR_TEST_MOCK_OPENVR_DEVICE_HOOK_BASE_H_
-#define CHROME_BROWSER_VR_TEST_MOCK_OPENVR_DEVICE_HOOK_BASE_H_
+#ifndef CHROME_BROWSER_VR_TEST_MOCK_XR_DEVICE_HOOK_BASE_H_
+#define CHROME_BROWSER_VR_TEST_MOCK_XR_DEVICE_HOOK_BASE_H_
 
 #include "base/containers/flat_map.h"
-#include "device/vr/openvr/test/test_hook.h"
 #include "device/vr/public/mojom/browser_test_interfaces.mojom.h"
+#include "device/vr/test/test_hook.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
-class MockOpenVRDeviceHookBase : public device_test::mojom::XRTestHook {
+class MockXRDeviceHookBase : public device_test::mojom::XRTestHook {
  public:
-  MockOpenVRDeviceHookBase();
-  ~MockOpenVRDeviceHookBase() override;
+  MockXRDeviceHookBase();
+  ~MockXRDeviceHookBase() override;
 
   // device_test::mojom::XRTestHook
   void OnFrameSubmitted(device_test::mojom::SubmittedFrameDataPtr frame_data,
@@ -41,7 +41,7 @@ class MockOpenVRDeviceHookBase : public device_test::mojom::XRTestHook {
       device_test::mojom::XRTestHook::WaitGetControllerDataCallback callback)
       override;
 
-  // MockOpenVRDeviceHookBase
+  // MockXRDeviceHookBase
   unsigned int ConnectController(
       const device::ControllerFrameData& initial_data);
   void UpdateController(unsigned int index,
@@ -62,4 +62,4 @@ class MockOpenVRDeviceHookBase : public device_test::mojom::XRTestHook {
   device_test::mojom::XRTestHookRegistrationPtr test_hook_registration_;
 };
 
-#endif  // CHROME_BROWSER_VR_TEST_MOCK_OPENVR_DEVICE_HOOK_BASE_H_
+#endif  // CHROME_BROWSER_VR_TEST_MOCK_XR_DEVICE_HOOK_BASE_H_

chrome/browser/vr/webxr_vr_frame_pose_browser_test.cc

@@ -5,7 +5,7 @@
 #include "base/environment.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/vr/test/mock_openvr_device_hook_base.h"
+#include "chrome/browser/vr/test/mock_xr_device_hook_base.h"
 #include "chrome/browser/vr/test/webxr_vr_browser_test.h"
 
 #include <memory>
@@ -20,7 +20,7 @@ struct Frame {
   device_test::mojom::DeviceConfigPtr config;
 };
 
-class MyOpenVRMock : public MockOpenVRDeviceHookBase {
+class MyXRMock : public MockXRDeviceHookBase {
  public:
   void OnFrameSubmitted(
       device_test::mojom::SubmittedFrameDataPtr frame_data,
@@ -80,7 +80,7 @@ unsigned int ParseColorFrameId(const device_test::mojom::ColorPtr& color) {
   return frame_id;
 }
 
-void MyOpenVRMock::OnFrameSubmitted(
+void MyXRMock::OnFrameSubmitted(
     device_test::mojom::SubmittedFrameDataPtr frame_data,
     device_test::mojom::XRTestHook::OnFrameSubmittedCallback callback) {
   unsigned int frame_id = ParseColorFrameId(frame_data->color);
@@ -108,7 +108,7 @@ void MyOpenVRMock::OnFrameSubmitted(
   std::move(callback).Run();
 }
 
-void MyOpenVRMock::WaitGetMagicWindowPose(
+void MyXRMock::WaitGetMagicWindowPose(
     device_test::mojom::XRTestHook::WaitGetMagicWindowPoseCallback callback) {
   auto pose = device_test::mojom::PoseFrameData::New();
 
@@ -119,7 +119,7 @@ void MyOpenVRMock::WaitGetMagicWindowPose(
   std::move(callback).Run(std::move(pose));
 }
 
-void MyOpenVRMock::WaitGetPresentingPose(
+void MyXRMock::WaitGetPresentingPose(
     device_test::mojom::XRTestHook::WaitGetPresentingPoseCallback callback) {
   DLOG(ERROR) << "WaitGetPresentingPose: " << frame_id_;
 
@@ -161,7 +161,7 @@ std::string GetPoseAsString(const Frame& frame) {
 // out. Validates that submitted frames used expected pose.
 void TestPresentationPosesImpl(WebXrVrBrowserTestBase* t,
                                std::string filename) {
-  MyOpenVRMock my_mock;
+  MyXRMock my_mock;
 
   // Load the test page, and enter presentation.
   t->LoadUrlAndAwaitInitialization(t->GetFileUrlForHtmlTestFile(filename));
@@ -178,8 +178,8 @@ void TestPresentationPosesImpl(WebXrVrBrowserTestBase* t,
   // Exit presentation.
   t->EndSessionOrFail();
 
-  // Stop hooking OpenVR, so we can safely analyze our cached data without
-  // incoming calls (there may be leftover mojo messages queued).
+  // Stop hooking the VR runtime so we can safely analyze our cached data
+  // without incoming calls (there may be leftover mojo messages queued).
   my_mock.StopHooking();
 
   // Analyze the submitted frames - check for a few things:

chrome/browser/vr/webxr_vr_input_browser_test.cc

@@ -3,10 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
-#include "chrome/browser/vr/test/mock_openvr_device_hook_base.h"
+#include "chrome/browser/vr/test/mock_xr_device_hook_base.h"
 #include "chrome/browser/vr/test/webvr_browser_test.h"
 #include "chrome/browser/vr/test/webxr_vr_browser_test.h"
-#include "device/vr/openvr/test/test_hook.h"
 #include "device/vr/public/mojom/browser_test_interfaces.mojom.h"
 #include "third_party/openvr/src/headers/openvr.h"
 
@@ -33,7 +32,7 @@ IN_PROC_BROWSER_TEST_F(WebXrVrBrowserTestStandard, TestPresentationLocksFocus) {
   TestPresentationLocksFocusImpl(this, "webxr_test_presentation_locks_focus");
 }
 
-class WebXrControllerInputOpenVRMock : public MockOpenVRDeviceHookBase {
+class WebXrControllerInputMock : public MockXRDeviceHookBase {
  public:
   void OnFrameSubmitted(
       device_test::mojom::SubmittedFrameDataPtr frame_data,
@@ -73,7 +72,7 @@ class WebXrControllerInputOpenVRMock : public MockOpenVRDeviceHookBase {
   unsigned int target_submitted_frames_ = 0;
 };
 
-void WebXrControllerInputOpenVRMock::OnFrameSubmitted(
+void WebXrControllerInputMock::OnFrameSubmitted(
     device_test::mojom::SubmittedFrameDataPtr frame_data,
     device_test::mojom::XRTestHook::OnFrameSubmittedCallback callback) {
   num_submitted_frames_++;
@@ -88,7 +87,7 @@ void WebXrControllerInputOpenVRMock::OnFrameSubmitted(
 // WebXrVrInputTest#testControllerClicksRegisteredOnDaydream_WebXr.
 IN_PROC_BROWSER_TEST_F(WebXrVrBrowserTestStandard,
                        TestControllerInputRegistered) {
-  WebXrControllerInputOpenVRMock my_mock;
+  WebXrControllerInputMock my_mock;
 
   // Connect a controller.
   auto controller_data = my_mock.CreateValidController(
@@ -120,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(WebXrVrBrowserTestStandard,
 // WebXrVrInputTest#testControllerClicksRegisteredOnDaydream
 IN_PROC_BROWSER_TEST_F(WebVrBrowserTestStandard,
                        TestControllerInputRegistered) {
-  WebXrControllerInputOpenVRMock my_mock;
+  WebXrControllerInputMock my_mock;
 
   // Connect a controller.
   auto controller_data = my_mock.CreateValidController(

chrome/browser/vr/webxr_vr_pixel_browser_test.cc

@@ -7,7 +7,7 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/vr/test/mock_openvr_device_hook_base.h"
+#include "chrome/browser/vr/test/mock_xr_device_hook_base.h"
 #include "chrome/browser/vr/test/webvr_browser_test.h"
 #include "chrome/browser/vr/test/webxr_vr_browser_test.h"
 
@@ -15,7 +15,7 @@
 
 namespace vr {
 
-class MyOpenVRMock : public MockOpenVRDeviceHookBase {
+class MyXRMock : public MockXRDeviceHookBase {
  public:
   void OnFrameSubmitted(
       device_test::mojom::SubmittedFrameDataPtr frame_data,
@@ -39,7 +39,7 @@ class MyOpenVRMock : public MockOpenVRDeviceHookBase {
   base::RunLoop* wait_loop_ = nullptr;
 };
 
-void MyOpenVRMock::OnFrameSubmitted(
+void MyXRMock::OnFrameSubmitted(
     device_test::mojom::SubmittedFrameDataPtr frame_data,
     device_test::mojom::XRTestHook::OnFrameSubmittedCallback callback) {
   last_submitted_color_ = std::move(frame_data->color);
@@ -56,7 +56,7 @@ void MyOpenVRMock::OnFrameSubmitted(
 // out. Validates that a pixel was rendered with the expected color.
 void TestPresentationPixelsImpl(WebXrVrBrowserTestBase* t,
                                 std::string filename) {
-  MyOpenVRMock my_mock;
+  MyXRMock my_mock;
 
   // Load the test page, and enter presentation.
   t->LoadUrlAndAwaitInitialization(t->GetFileUrlForHtmlTestFile(filename));

chrome/services/isolated_xr_device/xr_test_hook_wrapper.h

@@ -5,18 +5,19 @@
 #ifndef CHROME_SERVICES_ISOLATED_XR_DEVICE_XR_TEST_HOOK_WRAPPER_H_
 #define CHROME_SERVICES_ISOLATED_XR_DEVICE_XR_TEST_HOOK_WRAPPER_H_
 
-#include "device/vr/openvr/test/test_hook.h"
 #include "device/vr/public/mojom/browser_test_interfaces.mojom.h"
+#include "device/vr/test/test_hook.h"
 
 namespace device {
 
-// Wraps a mojo test hook to implement the OpenVRTestHook C++ interface.  Our
-// use of OpenVR is single-threaded at a time, and we initialize/uninitialize
+// Wraps a mojo test hook to implement the VRTestHook C++ interface.  Our use
+// of VR runtimes are single-threaded at a time, and we initialize/uninitialize
 // as we switch between immersive and non-immersive sessions.
 // The mojo pointer is thread-affine, but we can keep the same mojo connection
 // by getting its PtrInfo so we temporarily make the test hook mojo pointer
-// live on the thread that we are using OpenVR on while OpenVR is initialized.
-class XRTestHookWrapper : public OpenVRTestHook {
+// live on the thread that we are using the VR runtime on while the runtime is
+// initialized.
+class XRTestHookWrapper : public VRTestHook {
  public:
   explicit XRTestHookWrapper(device_test::mojom::XRTestHookPtrInfo hook_info);
   virtual ~XRTestHookWrapper();

device/vr/BUILD.gn

@@ -111,7 +111,7 @@ if (enable_vr) {
         "openvr/openvr_render_loop.h",
         "openvr/openvr_type_converters.cc",
         "openvr/openvr_type_converters.h",
-        "openvr/test/test_hook.h",
+        "test/test_hook.h",
       ]
     }
 
@@ -223,7 +223,7 @@ if (enable_openvr) {
       "openvr/test/fake_openvr_impl_api.cc",
       "openvr/test/test_helper.cc",
       "openvr/test/test_helper.h",
-      "openvr/test/test_hook.h",
+      "test/test_hook.h",
     ]
 
     libs = [

device/vr/openvr/openvr_api_wrapper.cc

@@ -6,7 +6,7 @@
 
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "device/vr/openvr/test/test_hook.h"
+#include "device/vr/test/test_hook.h"
 
 namespace device {
 
@@ -29,7 +29,7 @@ vr::IVRSystem* OpenVRWrapper::GetSystem() {
   return system_;
 }
 
-void OpenVRWrapper::SetTestHook(OpenVRTestHook* hook) {
+void OpenVRWrapper::SetTestHook(VRTestHook* hook) {
   // This may be called from any thread - tests are responsible for
   // maintaining thread safety, typically by not changing the test hook
   // while presenting.
@@ -93,7 +93,7 @@ void OpenVRWrapper::Uninitialize() {
   any_initialized_ = false;
 }
 
-OpenVRTestHook* OpenVRWrapper::test_hook_ = nullptr;
+VRTestHook* OpenVRWrapper::test_hook_ = nullptr;
 bool OpenVRWrapper::any_initialized_ = false;
 TestHookRegistration* OpenVRWrapper::test_hook_registration_ = nullptr;
 

device/vr/openvr/openvr_api_wrapper.h

@@ -14,7 +14,7 @@ class SingleThreadTaskRunner;
 }
 
 namespace device {
-class OpenVRTestHook;
+class VRTestHook;
 class TestHookRegistration;
 
 class OpenVRWrapper {
@@ -29,7 +29,7 @@ class OpenVRWrapper {
   vr::IVRCompositor* GetCompositor();
   vr::IVRSystem* GetSystem();
 
-  static void DEVICE_VR_EXPORT SetTestHook(OpenVRTestHook* hook);
+  static void DEVICE_VR_EXPORT SetTestHook(VRTestHook* hook);
 
  private:
   bool Initialize(bool for_rendering);
@@ -41,7 +41,7 @@ class OpenVRWrapper {
   bool initialized_ = false;
 
   static TestHookRegistration* test_hook_registration_;
-  static OpenVRTestHook* test_hook_;
+  static VRTestHook* test_hook_;
   static bool any_initialized_;
 };
 

device/vr/openvr/openvr_device_provider.cc

@@ -9,7 +9,7 @@
 #include "device/vr/isolated_gamepad_data_fetcher.h"
 #include "device/vr/openvr/openvr_api_wrapper.h"
 #include "device/vr/openvr/openvr_device.h"
-#include "device/vr/openvr/test/test_hook.h"
+#include "device/vr/test/test_hook.h"
 #include "third_party/openvr/src/headers/openvr.h"
 
 namespace device {
@@ -52,7 +52,7 @@ void OpenVRDeviceProvider::Initialize(
   std::move(initialization_complete).Run();
 }
 
-void OpenVRDeviceProvider::SetTestHook(OpenVRTestHook* test_hook) {
+void OpenVRDeviceProvider::SetTestHook(VRTestHook* test_hook) {
   OpenVRWrapper::SetTestHook(test_hook);
 }
 

device/vr/openvr/openvr_device_provider.h

@@ -15,7 +15,7 @@
 namespace device {
 
 class OpenVRDevice;
-class OpenVRTestHook;
+class VRTestHook;
 
 class DEVICE_VR_EXPORT OpenVRDeviceProvider : public VRDeviceProvider {
  public:
@@ -34,7 +34,7 @@ class DEVICE_VR_EXPORT OpenVRDeviceProvider : public VRDeviceProvider {
 
   static void RecordRuntimeAvailability();
 
-  static void SetTestHook(OpenVRTestHook*);
+  static void SetTestHook(VRTestHook*);
 
  private:
   void CreateDevice();

device/vr/openvr/test/fake_openvr_impl_api.cc

@@ -11,7 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "device/vr/openvr/test/test_helper.h"
-#include "device/vr/openvr/test/test_hook.h"
+#include "device/vr/test/test_hook.h"
 #include "third_party/openvr/src/headers/openvr.h"
 #include "third_party/openvr/src/src/ivrclientcore.h"
 

device/vr/openvr/test/test_helper.cc

@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
-#include "device/vr/openvr/test/test_hook.h"
+#include "device/vr/test/test_hook.h"
 #include "third_party/openvr/src/headers/openvr.h"
 #include "third_party/openvr/src/src/ivrclientcore.h"
 
@@ -283,7 +283,7 @@ bool TestHelper::GetControllerPose(unsigned int index,
   return false;
 }
 
-void TestHelper::SetTestHook(device::OpenVRTestHook* hook) {
+void TestHelper::SetTestHook(device::VRTestHook* hook) {
   base::AutoLock auto_lock(lock_);
   test_hook_ = hook;
 }

device/vr/openvr/test/test_helper.h

@@ -7,7 +7,7 @@
 
 #include "base/synchronization/lock.h"
 #include "base/thread_annotations.h"
-#include "device/vr/openvr/test/test_hook.h"
+#include "device/vr/test/test_hook.h"
 #include "third_party/openvr/src/headers/openvr.h"
 
 class ID3D11Texture2D;
@@ -48,10 +48,10 @@ class TestHelper : public device::TestHookRegistration {
   void DetachFromCurrentThread();
 
   // TestHookRegistration
-  void SetTestHook(device::OpenVRTestHook* hook) final;
+  void SetTestHook(device::VRTestHook* hook) final;
 
  private:
-  device::OpenVRTestHook* test_hook_ GUARDED_BY(lock_) = nullptr;
+  device::VRTestHook* test_hook_ GUARDED_BY(lock_) = nullptr;
   base::Lock lock_;
 };
 

device/vr/openvr/test/test_hook.h → device/vr/test/test_hook.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_VR_OPENVR_TEST_TEST_HOOK_H_
-#define DEVICE_VR_OPENVR_TEST_TEST_HOOK_H_
+#ifndef DEVICE_VR_TEST_TEST_HOOK_H_
+#define DEVICE_VR_TEST_TEST_HOOK_H_
 
 #include <cstdint>
 
@@ -80,8 +80,8 @@ struct ControllerFrameData {
   bool is_valid = false;
 };
 
-// Tests may implement this, and register it to control behavior of OpenVR.
-class OpenVRTestHook {
+// Tests may implement this, and register it to control behavior of VR runtime.
+class VRTestHook {
  public:
   virtual void OnFrameSubmitted(SubmittedFrameData frame_data) = 0;
   virtual DeviceConfig WaitGetDeviceConfig() = 0;
@@ -98,9 +98,9 @@ class OpenVRTestHook {
 
 class TestHookRegistration {
  public:
-  virtual void SetTestHook(OpenVRTestHook*) = 0;
+  virtual void SetTestHook(VRTestHook*) = 0;
 };
 
 }  // namespace device
 
-#endif  // DEVICE_VR_OPENVR_TEST_TEST_HOOK_H_
+#endif  // DEVICE_VR_TEST_TEST_HOOK_H_
\ No newline at end of file