Chromium Code Reviews
Help | Chromium Project | Sign in
(277)

Issue 2126005: Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch... (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
3 years, 11 months ago by Peter Kasting
Modified:
2 years, 11 months ago
Reviewers:
rvargas, rvargas1
CC:
chromium-reviews_chromium.org, brettw-cc_chromium.org, amit, ben+cc_chromium.org, PaweĊ‚ Hajdan Jr.
Visibility:
Public.

Description

Reland r47347 [was reverted in r47357], this time without re-enabling a DISABLED test that times out on Mac. (Original patch reviewed at http://codereview.chromium.org/2067003 )

Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken".

Make the "display" state only affect the current tab (not the entire host).

Fix an SSL browser test by supplying the appropriate SiteInstance*.

Move a test from "disabled" to "flaky" since it at least passes for me.

Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner.

BUG=15072, 18626, 40932, 42758
TEST=Covered by browser tests
Review URL: http://codereview.chromium.org/2063008

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=47428

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+448 lines, -387 lines) Lint Patch
M chrome/app/generated_resources.grd View 1 chunk +5 lines, -2 lines 0 comments 0 errors Download
M chrome/browser/external_tab_container.cc View 2 chunks +3 lines, -2 lines 0 comments 0 errors Download
M chrome/browser/page_info_model.cc View 1 chunk +3 lines, -2 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_browser_tests.cc View 23 chunks +113 lines, -54 lines 2 comments 0 errors Download
M chrome/browser/ssl/ssl_host_state.h View 3 chunks +6 lines, -9 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_host_state.cc View 2 chunks +8 lines, -9 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_host_state_unittest.cc View 2 chunks +13 lines, -13 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_manager.h View 4 chunks +34 lines, -34 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_manager.cc View 5 chunks +125 lines, -124 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy.h View 4 chunks +5 lines, -13 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy.cc View 4 chunks +53 lines, -45 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy_backend.h View 3 chunks +5 lines, -10 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy_backend.cc View 4 chunks +8 lines, -15 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/navigation_entry.h View 2 chunks +22 lines, -8 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/navigation_entry_unittest.cc View 1 chunk +9 lines, -5 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/tab_contents.h View 2 chunks +7 lines, -0 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/tab_contents.cc View 3 chunks +7 lines, -1 line 0 comments 0 errors Download
M chrome/browser/toolbar_model.cc View 1 chunk +1 line, -1 line 0 comments 0 errors Download
M chrome/common/notification_type.h View 2 chunks +7 lines, -10 lines 0 comments 0 errors Download
M chrome/test/automation/automation_messages.h View 5 chunks +10 lines, -5 lines 0 comments 0 errors Download
A + chrome/test/data/ssl/page_displays_mixed_content.html View 0 chunks +-1 lines, --1 lines 0 comments 0 errors Download
A + chrome/test/data/ssl/page_runs_mixed_content.html View 0 chunks +-1 lines, --1 lines 0 comments 0 errors Download
D chrome/test/data/ssl/page_with_http_script.html View 1 chunk +0 lines, -8 lines 0 comments 0 errors Download
D chrome/test/data/ssl/page_with_mixed_contents.html View 1 chunk +0 lines, -15 lines 0 comments 0 errors Download
M chrome_frame/chrome_active_document.cc View 3 chunks +6 lines, -4 lines 0 comments 0 errors Download
Trybot results:
Commit:

Messages

Total messages: 3
Peter Kasting
3 years, 11 months ago #1
rvargas
OK http://codereview.chromium.org/2126005/diff/1/5 File chrome/browser/ssl/ssl_browser_tests.cc (right): http://codereview.chromium.org/2126005/diff/1/5#newcode812 chrome/browser/ssl/ssl_browser_tests.cc:812: IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestGoodFrameNavigation) { Wasn't this the test that ...
3 years, 11 months ago #2
Peter Kasting
3 years, 11 months ago #3
http://codereview.chromium.org/2126005/diff/1/5
File chrome/browser/ssl/ssl_browser_tests.cc (right):

http://codereview.chromium.org/2126005/diff/1/5#newcode812
chrome/browser/ssl/ssl_browser_tests.cc:812: IN_PROC_BROWSER_TEST_F(SSLUITest,
FLAKY_TestGoodFrameNavigation) {
On 2010/05/17 17:52:06, rvargas wrote:
> Wasn't this the test that you were leaving disabled this time?

Yes.  The actual commit leaves it DISABLED.  This upload was from drover before
I had a chance to change it, and I dind't upload a second version.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1280:2d3e6564b7b6