Move SecurityLevel into a class of its own

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2402756866dad6e6cd065ab8bf1a79b3c724434c..ca081bfb5bf6d732b057ac71ab761c9b73362963 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -704,6 +704,8 @@
       'browser/speech/tts_platform.cc',
       'browser/speech/tts_platform.h',
       'browser/speech/tts_win.cc',
+      'browser/ssl/connection_security_helper_android.h',
+      'browser/ssl/connection_security_helper_android.cc',
       'browser/status_icons/status_icon.cc',
       'browser/status_icons/status_icon.h',
       'browser/status_icons/status_icon_menu_model.cc',
@@ -1732,6 +1734,7 @@
       'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java',
       'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java',
+      'android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurityHelper.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java',
     ],
     'chrome_browser_mdns_sources': [
@@ -2675,6 +2678,9 @@
       'browser/ssl/chrome_ssl_host_state_delegate.h',
       'browser/ssl/chrome_ssl_host_state_delegate_factory.cc',
       'browser/ssl/chrome_ssl_host_state_delegate_factory.h',
+      'browser/ssl/connection_security_helper.cc',
+      'browser/ssl/connection_security_helper_android.cc',
+      'browser/ssl/connection_security_helper.h',
       'browser/ssl/ssl_blocking_page.cc',
       'browser/ssl/ssl_blocking_page.h',
       'browser/ssl/ssl_cert_reporter.h',
@@ -3839,10 +3845,10 @@
         },
         {
           # GN: //chrome/android:chrome_android_java_enums_srcjar
-          'target_name': 'toolbar_model_security_levels_java',
+          'target_name': 'connection_security_helper_security_levels_java',
           'type': 'none',
           'variables': {
-            'source_file': 'browser/ui/toolbar/toolbar_model.h',
+            'source_file': 'browser/ssl/connection_security_helper.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },