diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 17:42:42 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 17:42:42 +0000 |
commit | 8a3422c9488ce79e305973d29a01811762e35465 (patch) | |
tree | 7fc94cb7aa013f7bb2afaf4100b1a8f45208cc00 /chrome/renderer | |
parent | 5eb64653873981c7dbf693a9aba7c7da011b14a3 (diff) | |
download | chromium_src-8a3422c9488ce79e305973d29a01811762e35465.zip chromium_src-8a3422c9488ce79e305973d29a01811762e35465.tar.gz chromium_src-8a3422c9488ce79e305973d29a01811762e35465.tar.bz2 |
This CL adds new UI tests for the SSL UI.
Some more info:
SSL UI Tests:
Added new tests for redirects and frames.
Also improved the mixed-content test to exercise the "block mixed-contents" preference and the show info-bar.
Automation:
For the new UI tests, added methods to tab_proxy and browser_proxy. The ones of most interest are GetLastNavigatinTime and WaitForNavigation that ensures we wait for a navigation to occur or have occured when taking actions that asynchronously trigger navigations.
Resource loading:
Added a flag to the response we get when loading a resource that indicates whether that resource was filtered (blocked or altered) by the security peer. We use this flag to notify back the browser when we report a load has been committed.
This is so the SSL manager knows a frame has been filtered (in which case we have no cert info but should not consider that as unsafe).
BUG=2004
Review URL: http://codereview.chromium.org/3165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/chrome_plugin_host.cc | 3 | ||||
-rw-r--r-- | chrome/renderer/render_view.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/chrome_plugin_host.cc b/chrome/renderer/chrome_plugin_host.cc index 9de6669..5caa99c 100644 --- a/chrome/renderer/chrome_plugin_host.cc +++ b/chrome/renderer/chrome_plugin_host.cc @@ -64,7 +64,8 @@ class PluginRequestHandlerProxy } virtual void OnReceivedResponse( - const ResourceLoaderBridge::ResponseInfo& info) { + const ResourceLoaderBridge::ResponseInfo& info, + bool content_filtered) { response_headers_ = info.headers; plugin_->functions().response_funcs->start_completed( cprequest_.get(), CPERR_SUCCESS); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 032584b..f9d6b33 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -940,6 +940,7 @@ void RenderView::UpdateURL(WebFrame* frame) { ViewHostMsg_FrameNavigate_Params params; params.is_post = false; params.page_id = page_id_; + params.is_content_filtered = response.IsContentFiltered(); if (!request.GetSecurityInfo().empty()) { // SSL state specified in the request takes precedence over the one in the // response. |