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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Issue 2542533004: Override DevTools security summary when a Safe Browsing warning shows. (Closed)
Patch Set: Address review feedback Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ssl/security_state_tab_helper_browser_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 45288bda7b3b04f5dead25eac3609efbe445707d..38c2d74aaeffc1e2bcac386995fbebb9b1483a90 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -43,6 +43,7 @@
#include "components/security_interstitials/core/controller_client.h"
#include "components/security_interstitials/core/metrics_helper.h"
#include "components/security_state/core/security_state.h"
+#include "components/strings/grit/components_strings.h"
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
@@ -58,6 +59,7 @@
#include "net/cert/mock_cert_verifier.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/url_request/url_request_mock_http_job.h"
+#include "ui/base/l10n/l10n_util.h"
using chrome_browser_interstitials::SecurityInterstitialIDNTest;
using content::BrowserThread;
@@ -1117,21 +1119,27 @@ class SecurityStyleTestObserver : public content::WebContentsObserver {
public:
explicit SecurityStyleTestObserver(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
- latest_security_style_(blink::WebSecurityStyleUnknown) {}
+ latest_security_style_(blink::WebSecurityStyleUnknown),
+ latest_security_style_explanations_() {}
blink::WebSecurityStyle latest_security_style() const {
return latest_security_style_;
}
+ content::SecurityStyleExplanations latest_security_style_explanations()
+ const {
+ return latest_security_style_explanations_;
+ }
+
// WebContentsObserver:
void DidChangeVisibleSecurityState() override {
- content::SecurityStyleExplanations security_style_explanations;
latest_security_style_ = web_contents()->GetDelegate()->GetSecurityStyle(
- web_contents(), &security_style_explanations);
+ web_contents(), &latest_security_style_explanations_);
}
private:
blink::WebSecurityStyle latest_security_style_;
+ content::SecurityStyleExplanations latest_security_style_explanations_;
DISALLOW_COPY_AND_ASSIGN(SecurityStyleTestObserver);
};
@@ -1150,6 +1158,9 @@ IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
ExpectSecurityIndicatorDowngrade(error_tab, 0u);
EXPECT_EQ(blink::WebSecurityStyleAuthenticationBroken,
observer.latest_security_style());
+ // Security style summary for Developer Tools should contain a warning.
+ EXPECT_EQ(l10n_util::GetStringUTF8(IDS_SAFEBROWSING_WARNING),
+ observer.latest_security_style_explanations().summary);
// The security indicator should still be downgraded post-interstitial.
EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
@@ -1267,18 +1278,28 @@ IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
// HTTPS (meaning that the SB state overrides the HTTPS state).
IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
SecurityState_ValidHTTPS) {
- // The security indicator should be downgraded while the interstitial shows.
- SetupWarningAndNavigateToValidHTTPS();
WebContents* error_tab = browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(error_tab);
+ SecurityStyleTestObserver observer(error_tab);
+
+ // The security indicator should be downgraded while the interstitial shows.
+ SetupWarningAndNavigateToValidHTTPS();
ExpectSecurityIndicatorDowngrade(error_tab, 0u);
+ // Security style summary for Developer Tools should contain a warning.
+ EXPECT_EQ(l10n_util::GetStringUTF8(IDS_SAFEBROWSING_WARNING),
+ observer.latest_security_style_explanations().summary);
+
// The security indicator should still be downgraded post-interstitial.
EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
AssertNoInterstitial(true);
WebContents* post_tab = browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(post_tab);
ExpectSecurityIndicatorDowngrade(post_tab, 0u);
+
+ // Security style summary for Developer Tools should still contain a warning.
+ EXPECT_EQ(l10n_util::GetStringUTF8(IDS_SAFEBROWSING_WARNING),
+ observer.latest_security_style_explanations().summary);
}
// Test that the security indicator is still downgraded after two interstitials
« no previous file with comments | « no previous file | chrome/browser/ssl/security_state_tab_helper_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698