diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 16:34:33 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 16:34:33 +0000 |
| commit | 41fb79a5c9b065fdf9ca2d6a1d4ba25e420b7372 (patch) | |
| tree | c1fac891eb9537b19e449a57108e3e8043d91e4e /chrome/browser/ssl | |
| parent | 2cd4da35ab0a15f919af0e8e52f627e5df632559 (diff) | |
| download | chromium_src-41fb79a5c9b065fdf9ca2d6a1d4ba25e420b7372.zip chromium_src-41fb79a5c9b065fdf9ca2d6a1d4ba25e420b7372.tar.gz chromium_src-41fb79a5c9b065fdf9ca2d6a1d4ba25e420b7372.tar.bz2 | |
Move process-per-site logic from BrowsingInstance to RenderProcessHost.
This avoids sharing SiteInstances across different BrowsingInstances.
BUG=11629
BUG=131676
TEST=See repro steps in http://crbug.com/131676.
Review URL: https://chromiumcodereview.appspot.com/10575014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index fe4cc00..830a58d 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -841,7 +841,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { test_server()->host_port_pair(), &replacement_path)); - // Create a new tab in the same process. + // Create a new tab in the same process. Using a NEW_FOREGROUND_TAB + // disposition won't usually stay in the same process, but this works + // because we are using process-per-site in SetUpCommandLine. GURL url = https_server_.GetURL(replacement_path); browser::NavigateParams params( browser(), url, content::PAGE_TRANSITION_TYPED); @@ -854,6 +856,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { TabContents* tab2 = params.target_contents; observer.Wait(); + // Both tabs should have the same process. + EXPECT_EQ(tab1->web_contents()->GetRenderProcessHost(), + tab2->web_contents()->GetRenderProcessHost()); + // The new tab has insecure content. CheckAuthenticationBrokenState(tab2->web_contents(), 0, true, false); |