Make ConnectionSecurityHelper a namespace instead of a class

chrome/browser/ssl/connection_security.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 "chrome/browser/ssl/connection_security.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.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"
 
 #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() {
+connection_security::SecurityLevel GetSecurityLevelForNonSecureFieldTrial() {
   std::string choice =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kMarkNonSecureAs);
   std::string group = base::FieldTrialList::FindFullName("MarkNonSecureAs");
 
   // Do not change this enum. It is used in the histogram.
   enum MarkNonSecureStatus { NEUTRAL, DUBIOUS, NON_SECURE, LAST_STATUS };
   const char kEnumeration[] = "MarkNonSecureAs";
 
-  ConnectionSecurityHelper::SecurityLevel level;
+  connection_security::SecurityLevel level;
   MarkNonSecureStatus status;
 
   if (choice == switches::kMarkNonSecureAsNeutral) {
     status = NEUTRAL;
-    level = ConnectionSecurityHelper::NONE;
+    level = connection_security::NONE;
   } else if (choice == switches::kMarkNonSecureAsDubious) {
     status = DUBIOUS;
-    level = ConnectionSecurityHelper::SECURITY_WARNING;
+    level = connection_security::SECURITY_WARNING;
   } else if (choice == switches::kMarkNonSecureAsNonSecure) {
     status = NON_SECURE;
-    level = ConnectionSecurityHelper::SECURITY_ERROR;
+    level = connection_security::SECURITY_ERROR;
   } else if (group == switches::kMarkNonSecureAsNeutral) {
     status = NEUTRAL;
-    level = ConnectionSecurityHelper::NONE;
+    level = connection_security::NONE;
   } else if (group == switches::kMarkNonSecureAsDubious) {
     status = DUBIOUS;
-    level = ConnectionSecurityHelper::SECURITY_WARNING;
+    level = connection_security::SECURITY_WARNING;
   } else if (group == switches::kMarkNonSecureAsNonSecure) {
     status = NON_SECURE;
-    level = ConnectionSecurityHelper::SECURITY_ERROR;
+    level = connection_security::SECURITY_ERROR;
   } else {
     status = NEUTRAL;
-    level = ConnectionSecurityHelper::NONE;
+    level = connection_security::NONE;
   }
 
   UMA_HISTOGRAM_ENUMERATION(kEnumeration, status, LAST_STATUS);
   return level;
 }
 
 }  // namespace
 
-ConnectionSecurityHelper::SecurityLevel
-ConnectionSecurityHelper::GetSecurityLevelForWebContents(
+namespace connection_security {
+
+SecurityLevel GetSecurityLevelForWebContents(
     const content::WebContents* web_contents) {
   if (!web_contents)
     return NONE;
 
   content::NavigationEntry* entry =
       web_contents->GetController().GetVisibleEntry();
   if (!entry)
     return NONE;
 
   const content::SSLStatus& ssl = entry->GetSSL();
@@ skipping 52 matching lines @@
         return EV_SECURE;
       return SECURE;
     }
 
     default:
       NOTREACHED();
       return NONE;
   }
 }
 
-content::SecurityStyle ConnectionSecurityHelper::GetSecurityStyleForWebContents(
+content::SecurityStyle GetSecurityStyleForWebContents(
     const content::WebContents* web_contents) {
   SecurityLevel security_level = GetSecurityLevelForWebContents(web_contents);
 
   switch (security_level) {
     case NONE:
       return content::SECURITY_STYLE_UNAUTHENTICATED;
     case EV_SECURE:
     case SECURE:
       return content::SECURITY_STYLE_AUTHENTICATED;
     case SECURITY_WARNING:
     case SECURITY_POLICY_WARNING:
       return content::SECURITY_STYLE_WARNING;
     case SECURITY_ERROR:
       return content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
   }
 
   NOTREACHED();
   return content::SECURITY_STYLE_UNKNOWN;
 }
+
+}  // namespace connection_security