| Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| index 18b5a68784c3e95a39efbed16264505a175c9dec..5849f1e67682e9b1b230f1a512449b6b22842f3a 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| @@ -334,10 +334,14 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
|
| EXPECT_EQ("/files/title2.html",
|
| shell()->web_contents()->GetLastCommittedURL().path());
|
|
|
| - // Should have the same SiteInstance.
|
| + // Should have the same SiteInstance unless we're in site-per-process mode.
|
| scoped_refptr<SiteInstance> noref_site_instance(
|
| shell()->web_contents()->GetSiteInstance());
|
| - EXPECT_EQ(orig_site_instance, noref_site_instance);
|
| + if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kSitePerProcess))
|
| + EXPECT_EQ(orig_site_instance, noref_site_instance);
|
| + else
|
| + EXPECT_NE(orig_site_instance, noref_site_instance);
|
| }
|
|
|
| // Test for crbug.com/116192. Targeted links should still work after the
|
|
|