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

chrome/browser/ssl/connection_security_helper.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl/connection_security_helper.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/cert_store.h"
 #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"
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif
 
 namespace {
 
 ConnectionSecurityHelper::SecurityLevel
 GetSecurityLevelForNonSecureFieldTrial() {
@@ skipping 31 matching lines @@
   if (!entry)
     return NONE;
 
   const content::SSLStatus& ssl = entry->GetSSL();
   switch (ssl.security_style) {
     case content::SECURITY_STYLE_UNKNOWN:
       return NONE;
 
     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;
     }
 
     case content::SECURITY_STYLE_AUTHENTICATION_BROKEN:
       return SECURITY_ERROR;
 
     case content::SECURITY_STYLE_AUTHENTICATED: {
 #if defined(OS_CHROMEOS)
       policy::PolicyCertService* service =
@@ skipping 34 matching lines @@
       if ((ssl.cert_status & net::CERT_STATUS_IS_EV) && cert)
         return EV_SECURE;
       return SECURE;
     }
 
     default:
       NOTREACHED();
       return NONE;
   }
 }