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

chrome/browser/ui/toolbar/test_toolbar_model.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_MODEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 
 // A ToolbarModel that is backed by instance variables, which are initialized
 // with some basic values that can be changed with the provided setters. This
 // should be used only for testing.
 class TestToolbarModel : public ToolbarModel {
  public:
   TestToolbarModel();
   ~TestToolbarModel() override;
   base::string16 GetText() const override;
   base::string16 GetFormattedURL(size_t* prefix_end) const override;
   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;
 
   void set_text(const base::string16& text) { text_ = text; }
   void set_url(const GURL& url) { url_ = url;}
   void set_perform_search_term_replacement(
       bool perform_search_term_replacement) {
     perform_search_term_replacement_ = perform_search_term_replacement;
   }
-  void set_security_level(SecurityLevel security_level) {
+  void set_security_level(
+      ConnectionSecurityHelper::SecurityLevel security_level) {
     security_level_ = security_level;
   }
   void set_icon(int icon) { icon_ = icon; }
   void set_ev_cert_name(const base::string16& ev_cert_name) {
     ev_cert_name_ = ev_cert_name;
   }
   void set_should_display_url(bool should_display_url) {
     should_display_url_ = should_display_url;
   }
 
  private:
   base::string16 text_;
   GURL url_;
   bool perform_search_term_replacement_;
-  SecurityLevel security_level_;
+  ConnectionSecurityHelper::SecurityLevel security_level_;
   int icon_;
   base::string16 ev_cert_name_;
   bool should_display_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestToolbarModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_MODEL_H_