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

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 9a8e18a9dcdc05378ab4974e4dca8414ffcf92fa..3f579277dccbadd4d907d4093e87c2a34480f337 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -211,9 +211,10 @@
       location_height - bubble_vertical_padding));
 
   const SkColor background_color =
-      GetColor(ToolbarModel::NONE, LocationBarView::BACKGROUND);
+      GetColor(ConnectionSecurityHelper::NONE, LocationBarView::BACKGROUND);
   ev_bubble_view_ = new EVBubbleView(
-      bubble_font_list, GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT),
+      bubble_font_list,
+      GetColor(ConnectionSecurityHelper::EV_SECURE, SECURITY_TEXT),
       background_color, this);
   ev_bubble_view_->set_drag_controller(this);
   AddChildView(ev_bubble_view_);
@@ -239,7 +240,7 @@
   ime_inline_autocomplete_view_->SetVisible(false);
   AddChildView(ime_inline_autocomplete_view_);
 
-  const SkColor text_color = GetColor(ToolbarModel::NONE, TEXT);
+  const SkColor text_color = GetColor(ConnectionSecurityHelper::NONE, TEXT);
   selected_keyword_view_ = new SelectedKeywordView(
       bubble_font_list, text_color, background_color, profile());
   AddChildView(selected_keyword_view_);
@@ -248,13 +249,13 @@
   suggested_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   suggested_text_view_->SetAutoColorReadabilityEnabled(false);
   suggested_text_view_->SetEnabledColor(GetColor(
-      ToolbarModel::NONE, LocationBarView::DEEMPHASIZED_TEXT));
+      ConnectionSecurityHelper::NONE, LocationBarView::DEEMPHASIZED_TEXT));
   suggested_text_view_->SetVisible(false);
   AddChildView(suggested_text_view_);
 
   keyword_hint_view_ = new KeywordHintView(
-      profile(), font_list,
-      GetColor(ToolbarModel::NONE, LocationBarView::DEEMPHASIZED_TEXT),
+      profile(), font_list, GetColor(ConnectionSecurityHelper::NONE,
+                                     LocationBarView::DEEMPHASIZED_TEXT),
       background_color);
   AddChildView(keyword_hint_view_);
 
@@ -313,8 +314,9 @@
   return omnibox_view_ != NULL;
 }
 
-SkColor LocationBarView::GetColor(ToolbarModel::SecurityLevel security_level,
-                                  ColorKind kind) const {
+SkColor LocationBarView::GetColor(
+    ConnectionSecurityHelper::SecurityLevel security_level,
+    ColorKind kind) const {
   const ui::NativeTheme* native_theme = GetNativeTheme();
   switch (kind) {
     case BACKGROUND:
@@ -338,17 +340,17 @@
     case SECURITY_TEXT: {
       SkColor color;
       switch (security_level) {
-        case ToolbarModel::EV_SECURE:
-        case ToolbarModel::SECURE:
+        case ConnectionSecurityHelper::EV_SECURE:
+        case ConnectionSecurityHelper::SECURE:
           color = SkColorSetRGB(7, 149, 0);
           break;
 
-        case ToolbarModel::SECURITY_WARNING:
-        case ToolbarModel::SECURITY_POLICY_WARNING:
+        case ConnectionSecurityHelper::SECURITY_WARNING:
+        case ConnectionSecurityHelper::SECURITY_POLICY_WARNING:
           return GetColor(security_level, DEEMPHASIZED_TEXT);
           break;
 
-        case ToolbarModel::SECURITY_ERROR:
+        case ConnectionSecurityHelper::SECURITY_ERROR:
           color = SkColorSetRGB(162, 0, 0);
           break;
 
@@ -998,8 +1000,8 @@
 }
 
 bool LocationBarView::ShouldShowEVBubble() const {
-  return
-      (GetToolbarModel()->GetSecurityLevel(false) == ToolbarModel::EV_SECURE);
+  return (GetToolbarModel()->GetSecurityLevel(false) ==
+          ConnectionSecurityHelper::EV_SECURE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1220,7 +1222,7 @@
   // the omnibox background, so we can't just blindly fill our entire bounds.
   gfx::Rect bounds(GetContentsBounds());
   bounds.Inset(GetHorizontalEdgeThickness(), vertical_edge_thickness());
-  SkColor color(GetColor(ToolbarModel::NONE, BACKGROUND));
+  SkColor color(GetColor(ConnectionSecurityHelper::NONE, BACKGROUND));
   if (is_popup_mode_) {
     canvas->FillRect(bounds, color);
   } else {