Revert of Revert of Use |IsOriginSecure| for mark-HTTP-nonsecure field trial

chrome/browser/ssl/connection_security_helper.cc

Index: chrome/browser/ssl/connection_security_helper.cc
diff --git a/chrome/browser/ssl/connection_security_helper.cc b/chrome/browser/ssl/connection_security_helper.cc
index 080b85b28705d3f1e9ba359dea11e00ee8eeb2ac..5ea9dcf7b8a4d8736c02f98091302f08e0353d82 100644
--- a/chrome/browser/ssl/connection_security_helper.cc
+++ b/chrome/browser/ssl/connection_security_helper.cc
@@ -16,12 +16,12 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/origin_util.h"
 #include "content/public/common/ssl_status.h"
 #include "net/base/net_util.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
-#include "url/url_constants.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
@@ -73,7 +73,7 @@
 
     case content::SECURITY_STYLE_UNAUTHENTICATED: {
       const GURL& url = entry->GetURL();
-      if (url.SchemeIs(url::kHttpScheme) || url.SchemeIs(url::kFtpScheme))
+      if (!content::IsOriginSecure(url))
         return GetSecurityLevelForNonSecureFieldTrial();
       return NONE;
     }