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

Unified Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2400673003: Remove SSLStatus::security_style member and content::SecurityStyle (Closed)
Patch Set: more curly braces Created 4 years, 2 months 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
Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 2d6129b62c88774d9a70c602e807e4620b4e3729..bca6e37b07ce789016f86430017cfee09ef2c92c 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -55,7 +55,6 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/referrer.h"
#include "content/public/common/resource_type.h"
-#include "content/public/common/security_style.h"
#include "content/public/common/web_preferences.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/content_browser_test.h"
@@ -1392,7 +1391,10 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest,
->DisplayedInsecureContent());
NavigationEntry* entry =
shell()->web_contents()->GetController().GetVisibleEntry();
- EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry->GetSSL().security_style);
+ EXPECT_TRUE(entry->GetSSL().initialized);
+ EXPECT_TRUE(
+ https_server.GetCertificate()->Equals(entry->GetSSL().certificate.get()));
+ EXPECT_EQ(0u, entry->GetSSL().cert_status);
shell()->Close();
@@ -1424,7 +1426,8 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest,
->DisplayedInsecureContent());
NavigationEntry* entry =
shell()->web_contents()->GetController().GetVisibleEntry();
- EXPECT_EQ(SECURITY_STYLE_UNAUTHENTICATED, entry->GetSSL().security_style);
+ EXPECT_TRUE(entry->GetSSL().initialized);
+ EXPECT_FALSE(entry->GetSSL().certificate);
shell()->Close();
« no previous file with comments | « content/browser/loader/navigation_resource_handler.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698