Fix tests to ship Aura overlay scrollbars for ChromeOS

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2948 matching lines @@
     navigation_observer.Wait();
     EXPECT_TRUE(observer.last_navigation_succeeded());
     EXPECT_EQ(cross_site_url, observer.last_navigation_url());
     EXPECT_EQ(0U, child->child_count());
   }
 }
 
 // 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
 #define MAYBE_FrameOwnerPropertiesPropagationScrolling \
         FrameOwnerPropertiesPropagationScrolling
 #endif
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                        MAYBE_FrameOwnerPropertiesPropagationScrolling) {
 #if defined(OS_MACOSX)
   ui::test::ScopedPreferredScrollerStyle scroller_style_override(false);
@@ skipping 12 matching lines @@
       "Where A = http://a.com/\n"
       "      B = http://b.com/",
       DepictFrameTree(root));
 
   FrameTreeNode* child = root->child_at(0);
 
   // If the available client width within the iframe is smaller than the
   // 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,
         "window.domAutomationController.send(document.body.clientWidth);",
         &client_width));
     const int kFrameElementWidth = 200;
     return client_width < kFrameElementWidth;
   };
 
   auto set_scrolling_property = [](RenderFrameHostImpl* parent_rfh,
@@ skipping 5514 matching lines @@
   EXPECT_TRUE(NavigateToURL(shell(), b_url));
 
   base::string16 expected_title(base::UTF8ToUTF16("foo"));
   TitleWatcher title_watcher(popup2->web_contents(), expected_title);
   EXPECT_TRUE(ExecuteScript(
       shell(), "window.open('','popup2').postMessage('foo', '*');"));
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace content