| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index f2f3e5d22f11aadc4105ab7e68ad9ea0f6ef4167..88082ccdf49ce975c6fb553b13351a4c28a033e1 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -11,9 +11,9 @@
|
| #include "content/child/webmessageportchannel_impl.h"
|
| #include "content/common/frame_messages.h"
|
| #include "content/common/frame_replication_state.h"
|
| +#include "content/common/site_isolation_policy.h"
|
| #include "content/common/swapped_out_messages.h"
|
| #include "content/common/view_messages.h"
|
| -#include "content/public/common/content_switches.h"
|
| #include "content/renderer/child_frame_compositing_helper.h"
|
| #include "content/renderer/render_frame_impl.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| @@ -119,8 +119,7 @@ RenderFrameProxy* RenderFrameProxy::FromWebFrame(blink::WebFrame* web_frame) {
|
|
|
| // static
|
| bool RenderFrameProxy::IsSwappedOutStateForbidden() {
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kSitePerProcess);
|
| + return SiteIsolationPolicy::AreCrossProcessFramesPossible();
|
| }
|
|
|
| RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id)
|
|
|