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

Issue 2095006: Revert 47347 - (Original patch reviewed at http://codereview.chromium.org/206... (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
5 years, 1 month ago by rvargas (out of office)
Modified:
4 years ago
Reviewers:
Peter Kasting
CC:
chromium-reviews, brettw-cc_chromium.org, amit, ben+cc_chromium.org, PaweĊ‚ Hajdan Jr.
Visibility:
Public.

Description

Revert 47347 - (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. Falied TestGoodFrameNavigation on Mac 10.5 browser tests among other things: /b/slave/chromium-rel-mac-builder/build/src/chrome/browser/ssl/ssl_browser_tests.cc:43: Failure Value of: entry->ssl().displayed_mixed_content() Actual: false Expected: displayed_mixed_content Which is: true BUG=15072, 18626, 40932, 42758 TEST=Covered by browser tests Review URL: http://codereview.chromium.org/2063008 TBR=pkasting@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=47357

Patch Set 1 #

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

Messages

Total messages: 4 (0 generated)
rvargas (out of office)
5 years, 1 month ago (2010-05-15 02:58:48 UTC) #1
Peter Kasting
I don't understand why a test that's marked FLAKY is causing the bot to turn ...
5 years, 1 month ago (2010-05-15 20:38:03 UTC) #2
rvargas (out of office)
I don't know the exact mechanics to turn a particular bot red with a test ...
5 years, 1 month ago (2010-05-17 16:42:43 UTC) #3
Peter Kasting
5 years, 1 month ago (2010-05-17 17:25:19 UTC) #4
On Mon, May 17, 2010 at 9:42 AM, Ricardo Vargas <rvargas@chromium.org>wrote:

> I don't know the exact mechanics to turn a particular bot red with a test
> marked flaky, but the test started to fail consistently (aka, not flaky
> anymore) and the failure looks like a consequence of this cl.


The only thing that affected this is that I changed the test from DISABLED
to FLAKY, which caused it to be run at all.  On the Mac, this test times
out, and FLAKY does not cover timeouts.  Therefore the only way to go is to
check in without un-disabling the test, and then figure out how to make it
work on the Mac.

I will re-land the patch leaving that test DISABLED for Mac for now.


> http://codereview.chromium.org/2095006/show
>>
>
>
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1f9106d