Revert of Move SecurityLevel into a class of its own

chrome/chrome_browser.gypi

 # 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 686 matching lines @@
       'browser/speech/tts_chromeos.cc',
       'browser/speech/tts_controller.h',
       'browser/speech/tts_controller_impl.cc',
       'browser/speech/tts_controller_impl.h',
       'browser/speech/tts_mac.mm',
       'browser/speech/tts_message_filter.cc',
       'browser/speech/tts_message_filter.h',
       'browser/speech/tts_platform.cc',
       'browser/speech/tts_platform.h',
       'browser/speech/tts_win.cc',
-      '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',
       'browser/status_icons/status_icon_menu_model.h',
       'browser/status_icons/status_icon_observer.h',
       'browser/status_icons/status_tray.cc',
       'browser/status_icons/status_tray.h',
       'browser/tab_contents/navigation_metrics_recorder.cc',
       'browser/tab_contents/navigation_metrics_recorder.h',
       'browser/tab_contents/retargeting_details.h',
@@ skipping 1008 matching lines @@
       'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
       'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java',
       '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': [
       'browser/local_discovery/privet_traffic_detector.cc',
       'browser/local_discovery/privet_traffic_detector.h',
       'browser/local_discovery/service_discovery_client_mdns.cc',
       'browser/local_discovery/service_discovery_client_mdns.h',
       'browser/local_discovery/service_discovery_client_utility.cc',
       'browser/local_discovery/service_discovery_client_utility.h',
       'browser/local_discovery/service_discovery_host_client.cc',
@@ skipping 923 matching lines @@
       'browser/spellchecker/spelling_service_client.cc',
       'browser/spellchecker/spelling_service_client.h',
       'browser/spellchecker/word_trimmer.cc',
       'browser/spellchecker/word_trimmer.h',
     ],
     'chrome_browser_ssl_sources': [
       'browser/ssl/chrome_ssl_host_state_delegate.cc',
       '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',
       'browser/ssl/ssl_client_certificate_selector.h',
       'browser/ssl/ssl_error_classification.cc',
       'browser/ssl/ssl_error_classification.h',
       'browser/ssl/ssl_error_handler.cc',
       'browser/ssl/ssl_error_handler.h',
       'browser/ssl/ssl_error_info.cc',
       'browser/ssl/ssl_error_info.h',
@@ skipping 1144 matching lines @@
           # GN: //chrome/android:chrome_android_java_enums_srcjar
           'target_name': 'profile_sync_service_model_type_selection_java',
           'type': 'none',
           'variables': {
             'source_file': 'browser/sync/profile_sync_service_android.cc',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //chrome/android:chrome_android_java_enums_srcjar
-          'target_name': 'connection_security_helper_security_levels_java',
+          'target_name': 'toolbar_model_security_levels_java',
           'type': 'none',
           'variables': {
-            'source_file': 'browser/ssl/connection_security_helper.h',
+            'source_file': 'browser/ui/toolbar/toolbar_model.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //chrome/android:chrome_android_java_enums_srcjar
           'target_name': 'tab_load_status_java',
           'type': 'none',
           'variables': {
             'source_file': 'browser/android/tab_android.h',
           },
@@ skipping 28 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }