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/browser/provisional_load_details.cc | |
| 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/browser/provisional_load_details.cc')
| -rw-r--r-- | chrome/browser/provisional_load_details.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/provisional_load_details.cc b/chrome/browser/provisional_load_details.cc index 274ecf8..f7a9f89 100644 --- a/chrome/browser/provisional_load_details.cc +++ b/chrome/browser/provisional_load_details.cc @@ -11,12 +11,14 @@ ProvisionalLoadDetails::ProvisionalLoadDetails(bool is_main_frame, bool is_interstitial_page, bool is_in_page_navigation, const GURL& url, - const std::string& security_info) + const std::string& security_info, + bool is_content_filtered) : is_main_frame_(is_main_frame), is_interstitial_page_(is_interstitial_page), is_in_page_navigation_(is_in_page_navigation), url_(url), - error_code_(net::OK) { + error_code_(net::OK), + is_content_filtered_(is_content_filtered) { SSLManager::DeserializeSecurityInfo(security_info, &ssl_cert_id_, &ssl_cert_status_, |