Revert of Revert of Move SecurityLevel into a class of its own

chrome/browser/ui/toolbar/toolbar_model_impl.h

Index: chrome/browser/ui/toolbar/toolbar_model_impl.h
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.h b/chrome/browser/ui/toolbar/toolbar_model_impl.h
index 0291cf38abc3a677b9d93734f17c36d3f852c4f6..0bea04547653ca6e755339fa0c8e684e903774e4 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.h
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.h
@@ -33,9 +33,6 @@
   explicit ToolbarModelImpl(ToolbarModelDelegate* delegate);
   ~ToolbarModelImpl() override;
 
-  static SecurityLevel GetSecurityLevelForWebContents(
-      content::WebContents* web_contents);
-
  private:
   // ToolbarModel:
   base::string16 GetText() const override;
@@ -43,9 +40,11 @@
   base::string16 GetCorpusNameForMobile() const override;
   GURL GetURL() const override;
   bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
-  SecurityLevel GetSecurityLevel(bool ignore_editing) const override;
+  ConnectionSecurityHelper::SecurityLevel GetSecurityLevel(
+      bool ignore_editing) const override;
   int GetIcon() const override;
-  int GetIconForSecurityLevel(SecurityLevel level) const override;
+  int GetIconForSecurityLevel(
+      ConnectionSecurityHelper::SecurityLevel level) const override;
   base::string16 GetEVCertName() const override;
   bool ShouldDisplayURL() const override;