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 7e7f4d21a4552ac94a4f226691fe3240f93826cc..372a996ddada5fd957315f854e1b40ab1bf5e7bc 100644 |
--- a/content/browser/site_per_process_browsertest.cc |
+++ b/content/browser/site_per_process_browsertest.cc |
@@ -15,7 +15,6 @@ |
#include "base/bind.h" |
#include "base/callback.h" |
#include "base/command_line.h" |
-#include "base/feature_list.h" |
#include "base/location.h" |
#include "base/memory/ptr_util.h" |
#include "base/path_service.h" |
@@ -88,7 +87,7 @@ |
#include "ui/events/event_utils.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/latency/latency_info.h" |
-#include "ui/native_theme/native_theme_features.h" |
+#include "ui/native_theme/native_theme_switches.h" |
#if defined(USE_AURA) |
#include "content/browser/renderer_host/render_widget_host_view_aura.h" |
@@ -620,15 +619,14 @@ std::string SitePerProcessBrowserTest::DepictFrameTree(FrameTreeNode* node) { |
void SitePerProcessBrowserTest::SetUpCommandLine( |
base::CommandLine* command_line) { |
IsolateAllSitesForTesting(command_line); |
-} |
- |
-void SitePerProcessBrowserTest::SetUpOnMainThread() { |
#if !defined(OS_ANDROID) |
// TODO(bokan): Needed for scrollability check in |
// FrameOwnerPropertiesPropagationScrolling. crbug.com/662196. |
- feature_list_.InitAndDisableFeature(features::kOverlayScrollbar); |
+ command_line->AppendSwitch(switches::kDisableOverlayScrollbar); |
#endif |
+}; |
+void SitePerProcessBrowserTest::SetUpOnMainThread() { |
host_resolver()->AddRule("*", "127.0.0.1"); |
SetupCrossSiteRedirector(embedded_test_server()); |
ASSERT_TRUE(embedded_test_server()->Start()); |