diff options
| author | creis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 21:15:49 +0000 |
|---|---|---|
| committer | creis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 21:15:49 +0000 |
| commit | 3596f90b2dffa20949870cd402833c3d5f05200e (patch) | |
| tree | a3d5caaf5ed63c786a7d4c9df6061c2600968dd4 /chrome/browser/ssl | |
| parent | c5ca64ecf5f73a2e9a484afdf9b75992eb0b1c4d (diff) | |
| download | chromium_src-3596f90b2dffa20949870cd402833c3d5f05200e.zip chromium_src-3596f90b2dffa20949870cd402833c3d5f05200e.tar.gz chromium_src-3596f90b2dffa20949870cd402833c3d5f05200e.tar.bz2 | |
This prevents an occasional DCHECK seen during the SSL UI test that happened
because of the unresponsive tab logic. If we are short-cutting a slow
beforeunload handler, we now avoid a redundant call to SetNavigationsSuspended.
Also clarified a few comments, removed what appeared to be an unnecessary call
to DidNavigateMainFrame, and re-enabled tests that were likely disabled due
to this issue.
BUG=6950
BUG=6698
TEST=SSLUITest.TestHTTPSExpiredCertAndDontProceed --single-process
TEST=SSLUITest.TestHTTPWithBrokenHTTPSResource
TEST=SSLUITest.TestOKHTTPS
TEST=SSLUITest.TestHTTPSExpiredCertAndProceed
Review URL: http://codereview.chromium.org/19006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_uitest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/ssl/ssl_uitest.cc b/chrome/browser/ssl/ssl_uitest.cc index 47cab12..2a84744 100644 --- a/chrome/browser/ssl/ssl_uitest.cc +++ b/chrome/browser/ssl/ssl_uitest.cc @@ -86,8 +86,7 @@ TEST_F(SSLUITest, TestHTTP) { // Visits a page over http which includes broken https resources (status should // be OK). -// Disabled as test causes hangs, see bug 6698 for details. -TEST_F(SSLUITest, DISABLED_TestHTTPWithBrokenHTTPSResource) { +TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) { scoped_refptr<HTTPTestServer> http_server = PlainServer(); scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -106,8 +105,7 @@ TEST_F(SSLUITest, DISABLED_TestHTTPWithBrokenHTTPSResource) { } // Visits a page over OK https: -// Disabled as test causes hangs, see bug 6698 for details. -TEST_F(SSLUITest, DISABLED_TestOKHTTPS) { +TEST_F(SSLUITest, TestOKHTTPS) { scoped_refptr<HTTPSTestServer> https_server = GoodCertServer(); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), @@ -128,8 +126,7 @@ TEST_F(SSLUITest, DISABLED_TestOKHTTPS) { } // Visits a page with https error and proceed: -// Disabled as test causes hangs, see bug 6698 for details. -TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndProceed) { +TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), |