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..48963b9adf9786c8a18783314725ec50329f0753 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.h
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/ssl/security_level_policy.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "url/gurl.h"
 
@@ -33,7 +34,7 @@ class ToolbarModelImpl : public ToolbarModel {
   explicit ToolbarModelImpl(ToolbarModelDelegate* delegate);
   ~ToolbarModelImpl() override;
 
-  static SecurityLevel GetSecurityLevelForWebContents(
+  static SecurityLevelPolicy::SecurityLevel GetSecurityLevelForWebContents(

[Peter Kasting, 2015/05/07 21:35:38]

I think this function should disappear and callers should use the underlying API
directly.

Since this method is neither giving you information related to the current
toolbar state, nor implemented in terms of underlying toolbar-based APIs, it no
longer belongs here.

[estark, 2015/05/09 02:29:08]

Done.

       content::WebContents* web_contents);
 
  private:
@@ -43,9 +44,11 @@ class ToolbarModelImpl : public ToolbarModel {
   base::string16 GetCorpusNameForMobile() const override;
   GURL GetURL() const override;
   bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
-  SecurityLevel GetSecurityLevel(bool ignore_editing) const override;
+  SecurityLevelPolicy::SecurityLevel GetSecurityLevel(
+      bool ignore_editing) const override;
   int GetIcon() const override;
-  int GetIconForSecurityLevel(SecurityLevel level) const override;
+  int GetIconForSecurityLevel(
+      SecurityLevelPolicy::SecurityLevel level) const override;
   base::string16 GetEVCertName() const override;
   bool ShouldDisplayURL() const override;