Refactor connection_security into SecurityStateModel

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 aa5089607a2a09b0ea9a3c8b92e96401c8917d02..3bca88e459bcc63868efa175cf698ff79596e47c 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.h
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.h
@@ -40,7 +40,7 @@ class ToolbarModelImpl : public ChromeToolbarModel {
   base::string16 GetCorpusNameForMobile() const override;
   GURL GetURL() const override;
   bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
-  connection_security::SecurityLevel GetSecurityLevel(
+  SecurityStateModel::SecurityLevel GetSecurityLevel(
       bool ignore_editing) const override;
   int GetIcon() const override;
   base::string16 GetEVCertName() const override;
@@ -48,7 +48,7 @@ class ToolbarModelImpl : public ChromeToolbarModel {
 
   // As |GetIcon()|, but returns the icon only taking into account the security
   // level| given, ignoring search term replacement state.
-  int GetIconForSecurityLevel(connection_security::SecurityLevel level) const;
+  int GetIconForSecurityLevel(SecurityStateModel::SecurityLevel level) const;
 
   // Returns the navigation controller used to retrieve the navigation entry
   // from which the states are retrieved.