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

chrome/browser/ui/toolbar/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_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/ssl/connection_security_helper.h"
 #include "url/gurl.h"
 
 namespace net {
 class X509Certificate;
 }
 
 // This class is the model used by the toolbar, location bar and autocomplete
 // edit.  It populates its states from the current navigation entry retrieved
 // from the navigation controller returned by GetNavigationController().
 class ToolbarModel {
  public:
-  // TODO(wtc): unify ToolbarModel::SecurityLevel with SecurityStyle.  We
-  // don't need two sets of security UI levels.  SECURITY_STYLE_AUTHENTICATED
-  // needs to be refined into three levels: warning, standard, and EV.
-  //
-  // A Java counterpart will be generated for this enum.
-  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.ui.toolbar
-  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ToolbarModelSecurityLevel
-  enum SecurityLevel {
-    // HTTP/no URL/user is editing
-    NONE = 0,
-
-    // HTTPS with valid EV cert
-    EV_SECURE = 1,
-
-    // HTTPS (non-EV)
-    SECURE = 2,
-
-    // HTTPS, but unable to check certificate revocation status or with insecure
-    // content on the page
-    SECURITY_WARNING = 3,
-
-    // HTTPS, but the certificate verification chain is anchored on a
-    // certificate that was installed by the system administrator
-    SECURITY_POLICY_WARNING = 4,
-
-    // Attempted HTTPS and failed, page not authenticated
-    SECURITY_ERROR = 5,
-
-    NUM_SECURITY_LEVELS = 6,
-  };
-
   virtual ~ToolbarModel();
 
   // Returns the text to be displayed in the toolbar for the current page.
   // This will have been formatted for display to the user.
   //   - If the current page's URL is a search URL for the user's default search
   //     engine, the query will be extracted and returned for display instead
   //     of the URL.
   //   - Otherwise, the text will contain the URL returned by GetFormattedURL().
   virtual base::string16 GetText() const = 0;
 
@@ skipping 22 matching lines @@
   virtual bool WouldPerformSearchTermReplacement(bool ignore_editing) const = 0;
 
   // Returns true if a call to GetText() would return something other than the
   // URL because of search term replacement.
   bool WouldReplaceURL() const;
 
   // Returns the security level that the toolbar should display.  If
   // |ignore_editing| is true, the result reflects the underlying state of the
   // page without regard to any user edits that may be in progress in the
   // omnibox.
-  virtual SecurityLevel GetSecurityLevel(bool ignore_editing) const = 0;
+  virtual ConnectionSecurityHelper::SecurityLevel GetSecurityLevel(
+      bool ignore_editing) const = 0;
 
   // Returns the resource_id of the icon to show to the left of the address,
   // based on the current URL.  When search term replacement is active, this
   // returns a search icon.  This doesn't cover specialized icons while the
   // user is editing; see OmniboxView::GetIcon().
   virtual int GetIcon() const = 0;
 
   // As |GetIcon()|, but returns the icon only taking into account the security
   // |level| given, ignoring search term replacement state.
-  virtual int GetIconForSecurityLevel(SecurityLevel level) const = 0;
+  virtual int GetIconForSecurityLevel(
+      ConnectionSecurityHelper::SecurityLevel level) const = 0;
 
   // Returns the name of the EV cert holder.  This returns an empty string if
   // the security level is not EV_SECURE.
   virtual base::string16 GetEVCertName() const = 0;
 
   // Returns whether the URL for the current navigation entry should be
   // in the location bar.
   virtual bool ShouldDisplayURL() const = 0;
 
   // Whether the text in the omnibox is currently being edited.
@@ skipping 14 matching lines @@
   ToolbarModel();
 
  private:
   bool input_in_progress_;
   bool url_replacement_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_