Move existing kSitePerProcess checks to a policy-oracle object

content/browser/frame_host/frame_tree_node.cc

 // Copyright 2013 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/frame_host/frame_tree_node.h"
 
 #include <queue>
 
 #include "base/command_line.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/site_isolation_policy.h"
 
 namespace content {
 
 namespace {
 
 // This is a global map between frame_tree_node_ids and pointers to
 // FrameTreeNodes.
 typedef base::hash_map<int, FrameTreeNode*> FrameTreeNodeIDMap;
 
 base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map =
@@ skipping 102 matching lines @@
       render_manager_.current_host()->GetSiteInstance()->GetBrowserContext(),
       render_manager_.current_host()->GetSiteInstance(),
       render_manager_.current_host()->GetRoutingID(),
       frame_routing_id);
   child->set_parent(this);
 
   // Other renderer processes in this BrowsingInstance may need to find out
   // about the new frame.  Create a proxy for the child frame in all
   // SiteInstances that have a proxy for the frame's parent, since all frames
   // in a frame tree should have the same set of proxies.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess))
+  // TODO(alexmos, nick): We ought to do this for non-oopif too, for openers.
+  if (SiteIsolationPolicy::AreCrossProcessFramesPossible())
     render_manager_.CreateProxiesForChildFrame(child.get());
 
   children_.push_back(child.release());
 }
 
 void FrameTreeNode::RemoveChild(FrameTreeNode* child) {
   std::vector<FrameTreeNode*>::iterator iter;
   for (iter = children_.begin(); iter != children_.end(); ++iter) {
     if ((*iter) == child)
       break;
@@ skipping 196 matching lines @@
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "465796 FrameTreeNode::DidStopLoading::End"));
 }
 
 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
   loading_progress_ = load_progress;
   frame_tree_->UpdateLoadProgress();
 }
 
 }  // namespace content