Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6570)

Unified Diff: chrome/browser/permissions/permission_manager_unittest.cc

Issue 2930993002: Fix new build break on Windows with OpenVR. (Closed)
Patch Set: Fix build break on Windows with OpenVR. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | device/vr/openvr/openvr_gamepad_data_fetcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_manager_unittest.cc
diff --git a/chrome/browser/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc
index 9e8d38584a812aa4b8fea8b7370d5554ee720a94..a24af584d21a71487e6aa58973239a2daf91ae5e 100644
--- a/chrome/browser/permissions/permission_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_manager_unittest.cc
@@ -17,18 +17,18 @@
#include "device/vr/features/features.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if BUILDFLAG(ENABLE_VR)
+#if BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
-#endif // BUILDFLAG(ENABLE_VR)
+#endif // BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
using blink::mojom::PermissionStatus;
using content::PermissionType;
namespace {
-#if BUILDFLAG(ENABLE_VR)
+#if BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
int kNoPendingOperation = -1;
-#endif // BUILDFLAG(ENABLE_VR)
+#endif // BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
class PermissionManagerTestingProfile final : public TestingProfile {
public:
@@ -400,7 +400,7 @@ TEST_F(PermissionManagerTest, SubscribeMIDIPermission) {
GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
}
-#if BUILDFLAG(ENABLE_VR)
+#if BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
TEST_F(PermissionManagerTest, SuppressPermissionRequests) {
content::WebContents* contents = web_contents();
vr_shell::VrTabHelper::CreateForWebContents(contents);
@@ -434,4 +434,4 @@ TEST_F(PermissionManagerTest, SuppressPermissionRequests) {
EXPECT_TRUE(callback_called());
EXPECT_EQ(PermissionStatus::GRANTED, callback_result());
}
-#endif // BUILDFLAG(ENABLE_VR)
+#endif // BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | device/vr/openvr/openvr_gamepad_data_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698