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

Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. (Closed)

Created:
6 years, 6 months ago by davidben
Modified:
6 years, 6 months ago
Reviewers:
jam, Yusuf, wtc, benm (inactive)
CC:
chromium-reviews, darin-cc_chromium.org, android-webview-reviews_chromium.org
Visibility:
Public.

Description

Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. That use is both wrong (request IDs are global) and unnecessary since cert enrollment is not a multi-step process. There's some stub code and indirections for prompting to add a cert that's never actually used. Collapse it all to simplify things. Move other random things out of SSLTabHelper which is also no longer necessary. (If anything, this stuff should probably go through the downloads infrastructure to inherit all the user-gesture and throttling checks.) Also move the AddCertificate hook from render_view_id to render_frame_id. BUG=376003 TEST=Visit https://davidben.net/mixed-content-test.html; Click button. Lock icon should change to lock icon with warning. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275503

Patch Set 1 #

Total comments: 3

Patch Set 2 : Finish killing SSLTabHelper #

Patch Set 3 : Fix Android build. #

Total comments: 7

Patch Set 4 : wtc comments #

Patch Set 5 : rebase #

Patch Set 6 : Rebase again. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+216 lines, -705 lines) Patch
M android_webview/browser/aw_content_browser_client.h View 1 2 3 4 1 chunk +2 lines, -3 lines 0 comments Download
M android_webview/browser/aw_content_browser_client.cc View 1 2 3 4 5 1 chunk +2 lines, -3 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java View 1 2 1 chunk +3 lines, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/Tab.java View 1 2 3 4 1 chunk +5 lines, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java View 1 1 chunk +6 lines, -0 lines 0 comments Download
M chrome/app/generated_resources.grd View 2 chunks +2 lines, -7 lines 0 comments Download
M chrome/browser/chrome_content_browser_client.h View 1 2 3 4 1 chunk +5 lines, -7 lines 0 comments Download
M chrome/browser/chrome_content_browser_client.cc View 1 2 3 4 5 2 chunks +6 lines, -15 lines 0 comments Download
D chrome/browser/ssl/ssl_add_cert_handler.h View 1 chunk +0 lines, -61 lines 0 comments Download
D chrome/browser/ssl/ssl_add_cert_handler.cc View 1 chunk +0 lines, -110 lines 0 comments Download
D chrome/browser/ssl/ssl_add_cert_handler_mac.mm View 1 chunk +0 lines, -88 lines 0 comments Download
M chrome/browser/ssl/ssl_add_certificate.h View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/ssl/ssl_add_certificate.cc View 1 2 3 2 chunks +144 lines, -5 lines 0 comments Download
M chrome/browser/ssl/ssl_add_certificate_android.cc View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/ssl/ssl_blocking_page.cc View 1 2 3 4 5 2 chunks +0 lines, -7 lines 0 comments Download
M chrome/browser/ssl/ssl_tab_helper.h View 1 1 chunk +0 lines, -79 lines 0 comments Download
M chrome/browser/ssl/ssl_tab_helper.cc View 1 1 chunk +0 lines, -268 lines 0 comments Download
M chrome/browser/ui/browser.h View 1 2 chunks +2 lines, -3 lines 0 comments Download
M chrome/browser/ui/browser.cc View 1 2 3 4 5 2 chunks +8 lines, -9 lines 0 comments Download
M chrome/browser/ui/tab_helpers.cc View 1 2 3 4 5 2 chunks +0 lines, -2 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 2 3 4 5 2 chunks +0 lines, -5 lines 0 comments Download
M components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java View 1 2 3 4 1 chunk +4 lines, -0 lines 0 comments Download
M components/web_contents_delegate_android/web_contents_delegate_android.h View 1 1 chunk +2 lines, -0 lines 0 comments Download
M components/web_contents_delegate_android/web_contents_delegate_android.cc View 1 2 3 4 1 chunk +11 lines, -0 lines 0 comments Download
M content/browser/android/web_contents_observer_android.h View 1 1 chunk +0 lines, -1 line 0 comments Download
M content/browser/android/web_contents_observer_android.cc View 1 2 3 4 5 1 chunk +0 lines, -8 lines 0 comments Download
M content/browser/loader/certificate_resource_handler.cc View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/web_contents/web_contents_impl.cc View 1 2 3 4 5 1 chunk +2 lines, -2 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java View 1 2 3 4 5 1 chunk +0 lines, -7 lines 0 comments Download
M content/public/browser/content_browser_client.h View 1 2 3 4 1 chunk +6 lines, -8 lines 0 comments Download
M content/public/browser/web_contents_delegate.h View 1 1 chunk +4 lines, -0 lines 0 comments Download
M content/public/browser/web_contents_observer.h View 1 1 chunk +0 lines, -3 lines 0 comments Download

Messages

Total messages: 25 (0 generated)
davidben
Some of this SSLTabHelper stuff was written by an intern who I think wasn't entirely ...
6 years, 6 months ago (2014-05-27 21:07:12 UTC) #1
davidben
Updated to remove SSLTabHelper. Per conversation, DidChangeVisibleSSLState is now on the WebContentsDelegate. +benm for Android-side ...
6 years, 6 months ago (2014-05-28 19:29:36 UTC) #2
jam
lgtm, please get a reviewer from chrome/browser/ssl/OWNERS to look at those files too
6 years, 6 months ago (2014-05-28 20:06:38 UTC) #3
davidben
+wtc for chrome/browser/ssl. Squashing a lot of things since we never ended up using any ...
6 years, 6 months ago (2014-05-28 20:13:42 UTC) #4
benm (inactive)
aw lgtm
6 years, 6 months ago (2014-05-29 09:25:07 UTC) #5
wtc
chrome/browser/ssl in patch set 3 LGTM. https://codereview.chromium.org/302653006/diff/40001/chrome/browser/ssl/ssl_add_certificate.cc File chrome/browser/ssl/ssl_add_certificate.cc (right): https://codereview.chromium.org/302653006/diff/40001/chrome/browser/ssl/ssl_add_certificate.cc#newcode35 chrome/browser/ssl/ssl_add_certificate.cc:35: // Creates an ...
6 years, 6 months ago (2014-05-29 19:31:46 UTC) #6
davidben
https://codereview.chromium.org/302653006/diff/40001/chrome/browser/ssl/ssl_add_certificate.cc File chrome/browser/ssl/ssl_add_certificate.cc (right): https://codereview.chromium.org/302653006/diff/40001/chrome/browser/ssl/ssl_add_certificate.cc#newcode35 chrome/browser/ssl/ssl_add_certificate.cc:35: // Creates an SSL cert result infobar and delegate. ...
6 years, 6 months ago (2014-05-29 19:51:01 UTC) #7
wtc
chrome/browser/ssl in patch set 4 LGTM.
6 years, 6 months ago (2014-05-29 20:11:15 UTC) #8
davidben
The CQ bit was checked by davidben@chromium.org
6 years, 6 months ago (2014-06-05 17:09:16 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/davidben@chromium.org/302653006/60001
6 years, 6 months ago (2014-06-05 17:10:23 UTC) #10
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: chromium_presubmit on tryserver.chromium ...
6 years, 6 months ago (2014-06-05 17:39:06 UTC) #11
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-05 17:42:16 UTC) #12
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/builds/71902)
6 years, 6 months ago (2014-06-05 17:42:17 UTC) #13
davidben
The CQ bit was checked by davidben@chromium.org
6 years, 6 months ago (2014-06-05 19:13:26 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/davidben@chromium.org/302653006/80001
6 years, 6 months ago (2014-06-05 19:14:47 UTC) #15
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: android_aosp on tryserver.chromium ...
6 years, 6 months ago (2014-06-05 20:09:58 UTC) #16
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-05 20:13:04 UTC) #17
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/builds/71952)
6 years, 6 months ago (2014-06-05 20:13:06 UTC) #18
davidben
The CQ bit was checked by davidben@chromium.org
6 years, 6 months ago (2014-06-06 18:26:59 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/davidben@chromium.org/302653006/100001
6 years, 6 months ago (2014-06-06 18:27:52 UTC) #20
commit-bot: I haz the power
Change committed as 275503
6 years, 6 months ago (2014-06-06 19:35:25 UTC) #21
Yusuf
Actually the API removed WebContentsObserverAndroid and TabObserver was being used downstream. How should we be ...
6 years, 6 months ago (2014-06-09 18:14:14 UTC) #22
gone
On 2014/06/09 18:14:14, Yusuf wrote: > Actually the API removed WebContentsObserverAndroid and TabObserver was being ...
6 years, 6 months ago (2014-06-09 18:28:17 UTC) #23
Yusuf
On 2014/06/09 18:28:17, dfalcantara wrote: > On 2014/06/09 18:14:14, Yusuf wrote: > > Actually the ...
6 years, 6 months ago (2014-06-09 18:30:09 UTC) #24
davidben
6 years, 6 months ago (2014-06-09 18:32:22 UTC) #25
Message was sent while issue was closed.
On 2014/06/09 18:14:14, Yusuf wrote:
> Actually the API removed WebContentsObserverAndroid and TabObserver was being
> used downstream. How should we be getting this information now?

I moved it to the TabObserver and made a companion CL to update downstream
Chrome for Android. Should it have been elsewhere?

> And for future cases, would you mind getting an Android OWNER approval also?
So
> that we are informed of coming changes and make preparations for the roll?

Hrm. I added benm@ based on I think
components/web_contents_delegate_android/OWNERS (or maybe it was just what git
cl upload chose, not sure). But I see now he only wrote "aw lgtm" for I guess
Android WebView? So that was miscommunicated. Sorry about that.

I did ping the Android sheriffs though. The downstream changes should have
happened in tandem. I made the relevant change and made sure to get that
reviewed before landing this one. It should have been taken care of, unless I
missed something.

Powered by Google App Engine
This is Rietveld 408576698