Revert of Refactor connection_security into SecurityStateModel

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a28107153391b853b3a1eda9a1b263294f3dcc34..6e1c6efc1bf01a01d30a8e3a591085175895737a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1831,7 +1831,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/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',
     ],
@@ -2746,10 +2746,10 @@
       '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',
@@ -4016,10 +4016,10 @@
         },
         {
           # 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' ],
         },