| Index: content/browser/frame_host/navigator_impl_unittest.cc
|
| diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc
|
| index a600dbf7fa7ad22136d6375ac02fa81fcd54c94e..e03f62a0f437516bd52a6898b97bc33c0d14e2f9 100644
|
| --- a/content/browser/frame_host/navigator_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigator_impl_unittest.cc
|
| @@ -2,7 +2,6 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/command_line.h"
|
| #include "base/macros.h"
|
| #include "base/time/time.h"
|
| #include "content/browser/frame_host/navigation_controller_impl.h"
|
| @@ -17,9 +16,9 @@
|
| #include "content/common/frame_messages.h"
|
| #include "content/common/navigation_params.h"
|
| #include "content/public/browser/stream_handle.h"
|
| -#include "content/public/common/content_switches.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "content/public/common/url_utils.h"
|
| +#include "content/public/test/browser_test_utils.h"
|
| #include "content/public/test/mock_render_process_host.h"
|
| #include "content/test/browser_side_navigation_test_utils.h"
|
| #include "content/test/test_navigation_url_loader.h"
|
| @@ -318,8 +317,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) {
|
| // Subframe navigations should never create a speculative RenderFrameHost,
|
| // unless site-per-process is enabled. In that case, as the subframe
|
| // navigation is to a different site and is still ongoing, it should have one.
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kSitePerProcess)) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_node));
|
| @@ -353,8 +351,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) {
|
|
|
| // As the main frame hasn't yet committed the subframe still exists. Thus, the
|
| // above situation regarding subframe navigations is valid here.
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kSitePerProcess)) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_node));
|
|
|