summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 21:29:30 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 21:29:30 +0000
commit36be2f94e6b1d6ef3b1f8ee6c638a4f929f506d0 (patch)
treef4e85a5dd17fa6436d8054cf6cd11fb3051cb946 /chrome/browser
parent08897c507d5f225f242a386055e8915520ed6acf (diff)
downloadchromium_src-36be2f94e6b1d6ef3b1f8ee6c638a4f929f506d0.zip
chromium_src-36be2f94e6b1d6ef3b1f8ee6c638a4f929f506d0.tar.gz
chromium_src-36be2f94e6b1d6ef3b1f8ee6c638a4f929f506d0.tar.bz2
Fix a debug assertin when running the web contents unit test. The error is in
the test since it would give the same page ID to two different pages in the same site instance, which should not happen. Review URL: http://codereview.chromium.org/2842 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/web_contents_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/web_contents_unittest.cc b/chrome/browser/web_contents_unittest.cc
index 5d386c5..dde6ba1 100644
--- a/chrome/browser/web_contents_unittest.cc
+++ b/chrome/browser/web_contents_unittest.cc
@@ -994,6 +994,9 @@ TEST_F(WebContentsTest, NavigateTwoTabsCrossSite) {
// Open a new tab with the same SiteInstance, navigated to the same site.
TestWebContents* contents2 = new TestWebContents(profile.get(), instance1);
+ params1.page_id = 2; // Need this since the site instance is the same (which
+ // is the scope of page IDs) and we want to consider
+ // this a new page.
contents2->transition_cross_site = true;
contents2->SetupController(profile.get());
contents2->controller()->LoadURL(url, PageTransition::TYPED);