Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(855)

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 1208143002: Move existing kSitePerProcess checks to a policy-oracle object (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@swapped_out_cmdline_checks
Patch Set: Partial fixes to Nasko's comments. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 4fc6640b860881e0fe4bfed4f4cd0f7179dc6e7c..c44a7e4dd7d6b37b176b78640b28750d5ced3c80 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -31,6 +31,7 @@
#include "content/public/common/bindings_policy.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/javascript_message_type.h"
+#include "content/public/common/site_isolation_policy.h"
#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
#include "content/public/test/browser_test_utils.h"
@@ -2036,8 +2037,8 @@ TEST_F(RenderFrameHostManagerTest,
// deleted when the node is detached. Motivated by http://crbug.com/441357 and
// http://crbug.com/444955.
TEST_F(RenderFrameHostManagerTest, DetachPendingChild) {
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kSitePerProcess);
+ SiteIsolationPolicy::IsolateAllSitesForTesting(
+ base::CommandLine::ForCurrentProcess());
const GURL kUrlA("http://www.google.com/");
const GURL kUrlB("http://webkit.org/");
@@ -2160,8 +2161,8 @@ TEST_F(RenderFrameHostManagerTest, DetachPendingChild) {
// tab navigates away without reloading. The second tab's navigation shouldn't
// mess with the first tab's content. Motivated by http://crbug.com/473714.
TEST_F(RenderFrameHostManagerTest, TwoTabsCrashOneReloadsOneLeaves) {
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kSitePerProcess);
+ SiteIsolationPolicy::IsolateAllSitesForTesting(
+ base::CommandLine::ForCurrentProcess());
const GURL kUrl1("http://www.google.com/");
const GURL kUrl2("http://webkit.org/");

Powered by Google App Engine
This is Rietveld 408576698