Move existing kSitePerProcess checks to a policy-oracle object

content/browser/frame_host/navigation_controller_impl_unittest.cc

Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index 7c54aad99df82591c699dca51156a4787fd3fc2c..257bb831c21228ec3f961b4662724e90a11fe8c1 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -34,6 +34,7 @@
 #include "content/public/common/page_state.h"
 #include "content/public/common/page_type.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_notification_tracker.h"
 #include "content/public/test/test_utils.h"
@@ -2084,8 +2085,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {
   EXPECT_EQ(params.page_id, entry->GetPageID());
 
   // Verify subframe entries if we're in --site-per-process mode.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+  if (AreAllSitesIsolatedForTesting()) {

[Charlie Reis, 2015/07/21 16:58:23]

UseSubframeNavigationEntries.  Same for all the cases below.

[ncarter (slow), 2015/07/22 23:29:08]

Done.

     // The entry should have a subframe FrameNavigationEntry.
     ASSERT_EQ(1U, entry->root_node()->children.size());
     EXPECT_EQ(url2, entry->root_node()->children[0]->frame_entry->url());
@@ -2142,8 +2142,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
   EXPECT_EQ(url1, root_entry->url());
 
   // Verify subframe entries if we're in --site-per-process mode.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+  if (AreAllSitesIsolatedForTesting()) {
     // The entry should now have a subframe FrameNavigationEntry.
     ASSERT_EQ(1U, entry->root_node()->children.size());
     FrameNavigationEntry* frame_entry =
@@ -2188,8 +2187,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
   EXPECT_EQ(url1, root_entry->url());
 
   // Verify subframe entries if we're in --site-per-process mode.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+  if (AreAllSitesIsolatedForTesting()) {
     // The entry should now have 2 subframe FrameNavigationEntries.
     ASSERT_EQ(2U, entry->root_node()->children.size());
     FrameNavigationEntry* new_frame_entry =
@@ -2238,8 +2236,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
   EXPECT_EQ(url1, root_entry->url());
 
   // Verify subframe entries if we're in --site-per-process mode.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+  if (AreAllSitesIsolatedForTesting()) {
     // The entry should now have a nested FrameNavigationEntry.
     EXPECT_EQ(2U, entry->root_node()->children.size());
     ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
@@ -2312,8 +2309,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
   EXPECT_EQ(2, controller.GetEntryCount());
 
   // Verify subframe entries if we're in --site-per-process mode.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+  if (AreAllSitesIsolatedForTesting()) {
     // The entry should have a subframe FrameNavigationEntry.
     ASSERT_EQ(1U, entry2->root_node()->children.size());
     EXPECT_EQ(url2, entry2->root_node()->children[0]->frame_entry->url());
@@ -2337,8 +2333,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
   EXPECT_EQ(2, controller.GetCurrentEntryIndex());
 
   // Verify subframe entries if we're in --site-per-process mode.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+  if (AreAllSitesIsolatedForTesting()) {
     // The entry should have a subframe FrameNavigationEntry.
     ASSERT_EQ(1U, entry3->root_node()->children.size());
     EXPECT_EQ(url3, entry3->root_node()->children[0]->frame_entry->url());