Fix tests to ship Aura overlay scrollbars for ChromeOS

content/browser/site_per_process_browsertest.cc

Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 55a2ab9ccfdf381c510fc51fe2d1ba762dbe1398..d7c2647999dad02b9e9f36892442f620abfc05d2 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -2966,7 +2966,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
 // Verify that "scrolling" property on frame elements propagates to child frames
 // correctly.
 // Does not work on android since android has scrollbars overlayed.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 #define MAYBE_FrameOwnerPropertiesPropagationScrolling \
         DISABLED_FrameOwnerPropertiesPropagationScrolling
 #else
@@ -2999,6 +2999,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
   // frame element's width, we assume there's a scrollbar.
   // Also note that just comparing clientHeight and scrollHeight of the frame's
   // document will not work.
+  // TODO(bokan): This check doesn't work if overlay scrollbars are enabled. It
+  // should be changed to something more reliable. crbug.com/662196.
   auto has_scrollbar = [](RenderFrameHostImpl* rfh) {
     int client_width;
     EXPECT_TRUE(ExecuteScriptAndExtractInt(rfh,