Revert of Refactor connection_security into SecurityStateModel

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 1813 matching lines @@
       'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.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/PermissionUpdateInfoBarDelegate.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/SecurityStateModel.java',
+      'android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurity.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java',
       'android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogHelper.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',
@@ skipping 894 matching lines @@
       'browser/ssl/cert_report_helper.cc',
       'browser/ssl/cert_report_helper.h',
       'browser/ssl/certificate_error_report.cc',
       'browser/ssl/certificate_error_report.h',
       '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/common_name_mismatch_handler.cc',
       'browser/ssl/common_name_mismatch_handler.h',
-      'browser/ssl/security_state_model_android.cc',
-      'browser/ssl/security_state_model_android.h',
-      'browser/ssl/security_state_model.cc',
-      'browser/ssl/security_state_model.h',
+      'browser/ssl/connection_security.cc',
+      'browser/ssl/connection_security.h',
+      'browser/ssl/connection_security_android.cc',
+      'browser/ssl/connection_security_android.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 1246 matching lines @@
           # GN: //chrome/android:chrome_android_java_enums_srcjar
           'target_name': 'profile_account_management_metrics_java',
           'type': 'none',
           'variables': {
             'source_file': 'browser/profiles/profile_metrics.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //chrome/android:chrome_android_java_enums_srcjar
-          'target_name': 'connection_security_levels_java',
+          'target_name': 'connection_security_security_levels_java',
           'type': 'none',
           'variables': {
-            'source_file': 'browser/ssl/security_state_model.h',
+            'source_file': 'browser/ssl/connection_security.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 87 matching lines @@
             '../components/components.gyp:omnibox_browser',
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
           ],
         },
       ],
     }],
   ],
 }