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

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 1642553004: Make a test not depend on system settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « no previous file | content/browser/theme_helper_mac.h » ('j') | content/browser/theme_helper_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d427d924b893206ee97e80ef97773e0433dd1c31..aaf095051fb383df9dcf037cbbf0e6d7ff111f84 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -51,6 +51,10 @@
#include "third_party/WebKit/public/web/WebSandboxFlags.h"
#include "ui/gfx/switches.h"
+#if defined(OS_MACOSX)
+#include "content/browser/theme_helper_mac.h"
+#endif
+
namespace content {
namespace {
@@ -2009,6 +2013,10 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
#endif
IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
MAYBE_FrameOwnerPropertiesPropagationScrolling) {
+#if defined(OS_MACOSX)
+ ScopedPreferredScrollerStyleOveride
+ scroller_style(blink::ScrollerStyleLegacy);
+#endif
GURL main_url(embedded_test_server()->GetURL(
"a.com", "/frame_owner_properties_scrolling.html"));
NavigateToURL(shell(), main_url);
« no previous file with comments | « no previous file | content/browser/theme_helper_mac.h » ('j') | content/browser/theme_helper_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698