Commit 830f8054 authored by Hiroki Sato's avatar Hiroki Sato Committed by Commit Bot

Replace CHROMEOS macro with OS_CHROMEOS

CHROMEOS macro is defined in third_party/webrtc.
This CL replaces it with more appropriate macro.

Bug: None
Change-Id: Ib027e5f8c35f5318919f515d97a22d3991607ca8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2022126
Commit-Queue: David Bokan <bokan@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735395}
parent 08435c30
...@@ -390,7 +390,7 @@ IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest, ...@@ -390,7 +390,7 @@ IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest,
} }
// Touchpad fling only happens on ChromeOS. // Touchpad fling only happens on ChromeOS.
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest, IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest,
TouchpadInertialGSUsBubbleFromOOPIF) { TouchpadInertialGSUsBubbleFromOOPIF) {
LoadPageWithOOPIF(); LoadPageWithOOPIF();
...@@ -408,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest, ...@@ -408,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest,
SimulateTouchpadFling(child_view_->host(), GetWidgetHost(), fling_velocity); SimulateTouchpadFling(child_view_->host(), GetWidgetHost(), fling_velocity);
WaitForFrameScroll(GetRootNode(), 15, true /* upward */); WaitForFrameScroll(GetRootNode(), 15, true /* upward */);
} }
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest, IN_PROC_BROWSER_TEST_F(BrowserSideFlingBrowserTest,
InertialGSEGetsBubbledFromOOPIF) { InertialGSEGetsBubbledFromOOPIF) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment