Revert of Move SecurityLevel into a class of its own

chrome/browser/ui/toolbar/test_toolbar_model.h

Index: chrome/browser/ui/toolbar/test_toolbar_model.h
diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.h b/chrome/browser/ui/toolbar/test_toolbar_model.h
index d604a80213ac4878826de88030dd6c8f873447a0..614ddc531d19f5c73ee6dfe8985b87a184011ce0 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
@@ -21,11 +21,9 @@
   base::string16 GetCorpusNameForMobile() const override;
   GURL GetURL() const override;
   bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
-  ConnectionSecurityHelper::SecurityLevel GetSecurityLevel(
-      bool ignore_editing) const override;
+  SecurityLevel GetSecurityLevel(bool ignore_editing) const override;
   int GetIcon() const override;
-  int GetIconForSecurityLevel(
-      ConnectionSecurityHelper::SecurityLevel level) const override;
+  int GetIconForSecurityLevel(SecurityLevel level) const override;
   base::string16 GetEVCertName() const override;
   bool ShouldDisplayURL() const override;
 
@@ -35,8 +33,7 @@
       bool perform_search_term_replacement) {
     perform_search_term_replacement_ = perform_search_term_replacement;
   }
-  void set_security_level(
-      ConnectionSecurityHelper::SecurityLevel security_level) {
+  void set_security_level(SecurityLevel security_level) {
     security_level_ = security_level;
   }
   void set_icon(int icon) { icon_ = icon; }
@@ -51,7 +48,7 @@
   base::string16 text_;
   GURL url_;
   bool perform_search_term_replacement_;
-  ConnectionSecurityHelper::SecurityLevel security_level_;
+  SecurityLevel security_level_;
   int icon_;
   base::string16 ev_cert_name_;
   bool should_display_url_;