Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)

Created:
4 years, 3 months ago by carlosk
Modified:
4 years, 3 months ago
CC:
android-webview-reviews_chromium.org, blink-reviews, blink-reviews-api_chromium.org, chromium-reviews, creis+watch_chromium.org, darin-cc_chromium.org, dglazkov+blink, Evan Stade, falken, gavinp+loader_chromium.org, horo, horo+watch_chromium.org, jam, Nate Chapin, jochen+watch_chromium.org, jsbell+serviceworker_chromium.org, kenjibaheux+watch_chromium.org, kinuko+serviceworker, kinuko+watch, loading-reviews_chromium.org, michaeln, mlamouri+watch-test-runner_chromium.org, mlamouri+watch-content_chromium.org, nasko+codewatch_chromium.org, nhiroki, Peter Beverloo, serviceworker-reviews, tyoshino+watch_chromium.org, tzik
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Remove the allow-displaying-mixed-content setting from Blink. As the ability for the user to avoid the displaying of mixed content was recently removed the respective Blink setting didn't need to exist anymore. This change removes it and also updates tests and other dependencies. BUG=631525 Committed: https://crrev.com/5f1c51795e03c929c36eb05960d5ff4fbcb16c37 Cr-Commit-Position: refs/heads/master@{#417354}

Patch Set 1 #

Patch Set 2 : Fixed the Android WebView tests (hopefully). #

Patch Set 3 : Cleanup before adding reviewers. #

Total comments: 7

Patch Set 4 : Updated JNI mixed content settings getters for Android WebView #

Total comments: 2

Patch Set 5 : Added preference cleanup code. #

Patch Set 6 : Rebase. #

Patch Set 7 : Fixed missign deprecated preference registration. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+53 lines, -126 lines) Patch
M android_webview/java/src/org/chromium/android_webview/AwSettings.java View 1 2 3 1 chunk +2 lines, -3 lines 0 comments Download
M android_webview/native/aw_settings.cc View 1 2 3 4 5 1 chunk +6 lines, -2 lines 0 comments Download
M android_webview/renderer/aw_content_settings_client.h View 1 chunk +0 lines, -3 lines 0 comments Download
M android_webview/renderer/aw_content_settings_client.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M chrome/browser/chrome_content_browser_client.cc View 1 2 3 4 5 1 chunk +0 lines, -2 lines 0 comments Download
M chrome/browser/prefs/browser_prefs.cc View 1 2 3 4 5 6 3 chunks +5 lines, -0 lines 0 comments Download
M chrome/browser/ui/prefs/prefs_tab_helper.cc View 1 2 3 4 5 2 chunks +0 lines, -3 lines 0 comments Download
M chrome/common/pref_names.h View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M chrome/common/pref_names.cc View 1 2 3 4 5 1 chunk +0 lines, -2 lines 0 comments Download
M chrome/renderer/content_settings_observer.h View 1 2 3 4 5 2 chunks +1 line, -3 lines 0 comments Download
M chrome/renderer/content_settings_observer.cc View 1 2 3 4 5 2 chunks +6 lines, -9 lines 0 comments Download
M components/test_runner/layout_test_runtime_flags.h View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M components/test_runner/layout_test_runtime_flags.cc View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M components/test_runner/mock_content_settings_client.h View 1 chunk +0 lines, -2 lines 0 comments Download
M components/test_runner/mock_content_settings_client.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M components/test_runner/test_preferences.h View 1 chunk +0 lines, -1 line 0 comments Download
M components/test_runner/test_preferences.cc View 1 chunk +0 lines, -1 line 0 comments Download
M components/test_runner/test_runner.h View 1 2 3 4 5 2 chunks +1 line, -2 lines 0 comments Download
M components/test_runner/test_runner.cc View 1 2 3 4 5 5 chunks +0 lines, -15 lines 0 comments Download
M content/public/common/common_param_traits_macros.h View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M content/public/common/web_preferences.h View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M content/public/common/web_preferences.cc View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/render_view_impl.cc View 1 2 3 4 5 1 chunk +0 lines, -2 lines 0 comments Download
M content/shell/renderer/layout_test/blink_test_helpers.cc View 2 chunks +0 lines, -3 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/fetch/resources/init.js View 1 1 chunk +0 lines, -2 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/inspector-protocol/resources/mixed-content-type-test.js View 1 1 chunk +0 lines, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-empty-srcset-in-main-frame-blocked.html View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-allowed.html View 1 1 chunk +0 lines, -2 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-blocked.html View 2 chunks +4 lines, -3 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html View 2 chunks +1 line, -4 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html View 2 chunks +3 lines, -4 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-srcset-in-main-frame-blocked.html View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/mixedContent/preload-insecure-image-in-main-frame-blocked.html View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/security/resources/referrer-policy-conflicting-policies.html View 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-mixed-content-to-inscope.html View 1 chunk +0 lines, -6 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-mixed-content-to-outscope.html View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/Source/core/frame/Settings.in View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M third_party/WebKit/Source/core/loader/FrameLoaderClient.h View 1 2 3 4 5 1 chunk +5 lines, -1 line 0 comments Download
M third_party/WebKit/Source/core/loader/MixedContentChecker.cpp View 1 2 1 chunk +2 lines, -1 line 0 comments Download
M third_party/WebKit/Source/web/FrameLoaderClientImpl.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp View 1 2 3 4 5 2 chunks +6 lines, -8 lines 0 comments Download
M third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M third_party/WebKit/Source/web/WebSettingsImpl.h View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M third_party/WebKit/Source/web/WebSettingsImpl.cpp View 1 2 3 4 5 1 chunk +0 lines, -5 lines 0 comments Download
M third_party/WebKit/public/web/WebContentSettingsClient.h View 2 chunks +4 lines, -4 lines 0 comments Download
M third_party/WebKit/public/web/WebSettings.h View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 63 (35 generated)
carlosk
Adding initial reviewers. mkwst@: PTAL at how I adapted mixed content checking, layout test harness ...
4 years, 3 months ago (2016-08-31 00:27:11 UTC) #12
Mike West
https://codereview.chromium.org/2278303002/diff/40001/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp File third_party/WebKit/Source/core/loader/MixedContentChecker.cpp (right): https://codereview.chromium.org/2278303002/diff/40001/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp#newcode220 third_party/WebKit/Source/core/loader/MixedContentChecker.cpp:220: client->passiveInsecureContentFound(url); It looks like `ContentSettingsObserver::passiveInsecureContentFound` would end up changing ...
4 years, 3 months ago (2016-08-31 09:46:52 UTC) #15
Torne
https://codereview.chromium.org/2278303002/diff/40001/android_webview/native/aw_settings.cc File android_webview/native/aw_settings.cc (right): https://codereview.chromium.org/2278303002/diff/40001/android_webview/native/aw_settings.cc#newcode434 android_webview/native/aw_settings.cc:434: Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj)); These two DCHECKs are identical? Also, it'd ...
4 years, 3 months ago (2016-08-31 12:49:59 UTC) #17
Torne
Apparently DCHECK_IMPLIES was removed, but in any case if you change the JNI here it ...
4 years, 3 months ago (2016-08-31 13:05:20 UTC) #18
carlosk
Thanks. https://codereview.chromium.org/2278303002/diff/40001/android_webview/native/aw_settings.cc File android_webview/native/aw_settings.cc (right): https://codereview.chromium.org/2278303002/diff/40001/android_webview/native/aw_settings.cc#newcode434 android_webview/native/aw_settings.cc:434: Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj)); On 2016/08/31 12:49:59, Torne wrote: > ...
4 years, 3 months ago (2016-09-02 23:47:43 UTC) #20
Mike West
https://codereview.chromium.org/2278303002/diff/40001/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp File third_party/WebKit/Source/core/loader/MixedContentChecker.cpp (right): https://codereview.chromium.org/2278303002/diff/40001/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp#newcode220 third_party/WebKit/Source/core/loader/MixedContentChecker.cpp:220: client->passiveInsecureContentFound(url); On 2016/09/02 at 23:47:42, carlosk wrote: > On ...
4 years, 3 months ago (2016-09-05 10:01:51 UTC) #24
Torne
android_webview LGTM, thanks!
4 years, 3 months ago (2016-09-05 11:01:22 UTC) #25
carlosk
nasko@chromium.org: PTAL content/public/** and content/renderer/**. thestig@chromium.org: PTAL chrome/browser/ui/** and chrome/renderer/**.
4 years, 3 months ago (2016-09-06 17:08:16 UTC) #27
Lei Zhang
https://codereview.chromium.org/2278303002/diff/60001/chrome/common/pref_names.h File chrome/common/pref_names.h (left): https://codereview.chromium.org/2278303002/diff/60001/chrome/common/pref_names.h#oldcode145 chrome/common/pref_names.h:145: extern const char kWebKitAllowDisplayingInsecureContent[]; Do we need to do ...
4 years, 3 months ago (2016-09-06 19:03:19 UTC) #28
carlosk
Thanks. https://codereview.chromium.org/2278303002/diff/60001/chrome/common/pref_names.h File chrome/common/pref_names.h (left): https://codereview.chromium.org/2278303002/diff/60001/chrome/common/pref_names.h#oldcode145 chrome/common/pref_names.h:145: extern const char kWebKitAllowDisplayingInsecureContent[]; On 2016/09/06 19:03:18, Lei ...
4 years, 3 months ago (2016-09-07 01:25:01 UTC) #31
Lei Zhang
lgtm, though: a) Your patch does not apply at the moment. b) This CL is ...
4 years, 3 months ago (2016-09-07 01:33:19 UTC) #34
Lei Zhang
On 2016/09/07 01:33:19, Lei Zhang wrote: > lgtm, though: > > a) Your patch does ...
4 years, 3 months ago (2016-09-07 06:46:03 UTC) #35
carlosk
On 2016/09/07 06:46:03, Lei Zhang wrote: > On 2016/09/07 01:33:19, Lei Zhang wrote: > > ...
4 years, 3 months ago (2016-09-07 17:45:03 UTC) #38
nasko
content/ LGTM. It does looks like a bunch of tests are failing though.
4 years, 3 months ago (2016-09-07 20:52:29 UTC) #41
carlosk
On 2016/09/07 20:52:29, nasko (slow) wrote: > content/ LGTM. It does looks like a bunch ...
4 years, 3 months ago (2016-09-07 20:58:57 UTC) #42
nasko
On 2016/09/07 20:58:57, carlosk wrote: > On 2016/09/07 20:52:29, nasko (slow) wrote: > > content/ ...
4 years, 3 months ago (2016-09-07 21:00:10 UTC) #43
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2278303002/100001
4 years, 3 months ago (2016-09-07 21:35:44 UTC) #46
commit-bot: I haz the power
Exceeded global retry quota
4 years, 3 months ago (2016-09-07 22:33:45 UTC) #48
carlosk
On 2016/09/07 22:33:45, commit-bot: I haz the power wrote: > Exceeded global retry quota This ...
4 years, 3 months ago (2016-09-07 23:15:21 UTC) #49
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2278303002/100001
4 years, 3 months ago (2016-09-07 23:23:48 UTC) #51
boliu
On 2016/09/07 23:15:21, carlosk wrote: > On 2016/09/07 22:33:45, commit-bot: I haz the power wrote: ...
4 years, 3 months ago (2016-09-07 23:32:49 UTC) #52
commit-bot: I haz the power
Try jobs failed on following builders: linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/137772)
4 years, 3 months ago (2016-09-07 23:33:28 UTC) #54
carlosk
You're right. This is my change. Sorry about the noise. On Wed, Sep 7, 2016 ...
4 years, 3 months ago (2016-09-07 23:41:21 UTC) #55
Lei Zhang
On 2016/09/07 23:32:49, boliu wrote: > On 2016/09/07 23:15:21, carlosk wrote: > > On 2016/09/07 ...
4 years, 3 months ago (2016-09-07 23:41:37 UTC) #56
carlosk
You're right. This is my change. Sorry about the noise. On Wed, Sep 7, 2016 ...
4 years, 3 months ago (2016-09-07 23:48:10 UTC) #57
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2278303002/120001
4 years, 3 months ago (2016-09-08 16:52:28 UTC) #60
commit-bot: I haz the power
Committed patchset #7 (id:120001)
4 years, 3 months ago (2016-09-08 18:59:59 UTC) #61
commit-bot: I haz the power
4 years, 3 months ago (2016-09-08 19:01:37 UTC) #63
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/5f1c51795e03c929c36eb05960d5ff4fbcb16c37
Cr-Commit-Position: refs/heads/master@{#417354}

Powered by Google App Engine
This is Rietveld 408576698