Make ConnectionSecurityHelper a namespace instead of a class

chrome/browser/ui/toolbar/test_toolbar_model.cc

Index: chrome/browser/ui/toolbar/test_toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.cc b/chrome/browser/ui/toolbar/test_toolbar_model.cc
index b345a1b9e82b398c61263593eef34ecaf5d94e1a..977efe9cace5ed926366ef74a8e1970eb964cc62 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
@@ -9,7 +9,7 @@
 TestToolbarModel::TestToolbarModel()
     : ToolbarModel(),
       perform_search_term_replacement_(false),
-      security_level_(ConnectionSecurityHelper::NONE),
+      security_level_(ConnectionSecurityStatus::NONE),
       icon_(IDR_LOCATION_BAR_HTTP),
       should_display_url_(true) {
 }
@@ -37,7 +37,7 @@ bool TestToolbarModel::WouldPerformSearchTermReplacement(
   return perform_search_term_replacement_;
 }
 
-ConnectionSecurityHelper::SecurityLevel TestToolbarModel::GetSecurityLevel(
+ConnectionSecurityStatus::SecurityLevel TestToolbarModel::GetSecurityLevel(
     bool ignore_editing) const {
   return security_level_;
 }
@@ -47,12 +47,12 @@ int TestToolbarModel::GetIcon() const {
 }
 
 int TestToolbarModel::GetIconForSecurityLevel(
-    ConnectionSecurityHelper::SecurityLevel level) const {
+    ConnectionSecurityStatus::SecurityLevel level) const {
   return icon_;
 }
 
 base::string16 TestToolbarModel::GetEVCertName() const {
-  return (security_level_ == ConnectionSecurityHelper::EV_SECURE)
+  return (security_level_ == ConnectionSecurityStatus::EV_SECURE)
              ? ev_cert_name_
              : base::string16();
 }