Revert "Create //ios/web/public/security/BUILD.gn."

This reverts commit daad88b5.

Reason for revert: Breaks internal compile.

Original change's description:
> Create //ios/web/public/security/BUILD.gn.
> 
> This CL creates //ios/web/public/security/BUILD.gn and removes the
> temporary header //ios/web/public/certificate_policy_cache.h
> 
> Bug: 956511,942244
> Change-Id: I7f70539cb2ce2d504e058a94a585124d265e12a9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1624809
> Reviewed-by: Christopher Thompson <cthomp@chromium.org>
> Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
> Reviewed-by: Eugene But <eugenebut@chromium.org>
> Commit-Queue: Yi Su <mrsuyi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#663093}

TBR=marq@chromium.org,eugenebut@chromium.org,mahmadi@chromium.org,cthomp@chromium.org,mrsuyi@chromium.org

Change-Id: I370fafb2a873946e396fac17344c163b44a763d4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 956511, 942244
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626491Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663140}

components/autofill/ios/browser/BUILD.gn

@@ -42,7 +42,6 @@ source_set("browser") {
     "//google_apis",
     "//ios/web/common",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//services/network/public/cpp",
     "//ui/gfx/geometry",
   ]

components/security_state/ios/BUILD.gn

@@ -14,6 +14,5 @@ jumbo_source_set("ios") {
     "//base",
     "//components/security_state/core/",
     "//ios/web/public/",
-    "//ios/web/public/security",
   ]
 }

ios/chrome/browser/interstitials/BUILD.gn

@@ -26,7 +26,6 @@ source_set("interstitials") {
     "//ios/chrome/browser/ui/util",
     "//ios/web",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ui/base",
     "//url",
   ]

ios/chrome/browser/passwords/BUILD.gn

@@ -190,7 +190,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web:web_internal",
     "//ios/testing:ocmock_support",
     "//ios/web",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//net:test_support",

ios/chrome/browser/payments/BUILD.gn

@@ -47,7 +47,6 @@ source_set("payments") {
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/signin",
     "//ios/web",
-    "//ios/web/public/security",
     "//net",
     "//services/identity/public/cpp:cpp",
     "//ui/base",

ios/chrome/browser/reading_list/BUILD.gn

@@ -48,7 +48,6 @@ source_set("reading_list") {
     "//ios/chrome/common",
     "//ios/web",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//net",
     "//ui/base",
     "//url",

ios/chrome/browser/ssl/BUILD.gn

@@ -41,7 +41,6 @@ source_set("ssl") {
     "//ios/public/provider/chrome/browser",
     "//ios/web/common",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//net",
     "//ui/base",
     "//url",
@@ -75,7 +74,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/web:test_support",
     "//ios/web",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//net",
     "//net:test_support",

ios/chrome/browser/tabs/BUILD.gn

@@ -133,7 +133,6 @@ source_set("tabs_internal") {
     "//ios/public/provider/chrome/browser",
     "//ios/web",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//net",
     "//ui/base",
     "//url",

ios/chrome/browser/ui/fullscreen/BUILD.gn

@@ -100,7 +100,6 @@ source_set("internal") {
     "//ios/public/provider/chrome/browser/ui",
     "//ios/web",
     "//ios/web/common",
-    "//ios/web/public/security",
     "//ui/gfx/geometry",
   ]
 }
@@ -148,7 +147,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/web/common",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ios/web/public/test/fakes",
     "//testing/gmock",
     "//testing/gtest",

ios/chrome/browser/ui/location_bar/BUILD.gn

@@ -73,7 +73,6 @@ source_set("location_bar") {
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web/public:public",
-    "//ios/web/public/security",
     "//skia",
     "//third_party/google_toolbox_for_mac",
     "//ui/base",
@@ -109,7 +108,6 @@ source_set("location_bar_model_delegate") {
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public",
-    "//ios/web/public/security",
   ]
   libs = [ "UIKit.framework" ]
 }

ios/chrome/browser/ui/page_info/BUILD.gn

@@ -30,7 +30,6 @@ source_set("page_info") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/web",
-    "//ios/web/public/security",
     "//ui/base",
     "//ui/gfx",
     "//url",

ios/chrome/browser/ui/payments/BUILD.gn

@@ -92,7 +92,6 @@ source_set("payments") {
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web/common",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//third_party/libaddressinput",
     "//third_party/libaddressinput:strings_grit",
     "//ui/base",

ios/web/BUILD.gn

@@ -44,7 +44,6 @@ source_set("web") {
     "//ios/web/navigation",
     "//ios/web/net",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ios/web/security",
     "//ios/web/web_state",
     "//ios/web/web_state:error_translation_util",
@@ -321,7 +320,6 @@ source_set("ios_web_net_unittests") {
     "//ios/web/navigation",
     "//ios/web/net/cookies",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//ios/web/security",
@@ -411,7 +409,6 @@ source_set("ios_web_web_state_unittests") {
     "//ios/web/navigation",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//ios/web/security",
@@ -592,7 +589,6 @@ test("ios_web_inttests") {
     "//ios/web/navigation:core",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public/find_in_page",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/fakes",

ios/web/navigation/BUILD.gn

@@ -23,7 +23,6 @@ source_set("navigation") {
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
     "//ios/web/public/download",
-    "//ios/web/public/security",
     "//ios/web/web_state:session_certificate_policy_cache",
     "//ios/web/web_state:user_interaction",
     "//ios/web/web_state:web_state_impl_header",
@@ -78,7 +77,6 @@ source_set("core") {
     "//components/url_formatter:url_formatter",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ui/base",
   ]
 

ios/web/net/BUILD.gn

@@ -10,9 +10,6 @@ source_set("net") {
     "//ios/net",
     "//ios/web:core",
     "//ios/web/public",
-    "//ios/web/public/security",
-    "//ios/web/security",
-    "//net",
   ]
 
   sources = [

ios/web/public/BUILD.gn

@@ -22,6 +22,7 @@ source_set("public") {
   sources = [
     "browser_state.h",
     "browser_url_rewriter.h",
+    "certificate_policy_cache.h",
     "crw_navigation_item_storage.h",
     "crw_session_certificate_policy_cache_storage.h",
     "crw_session_certificate_policy_cache_storage.mm",
@@ -39,6 +40,12 @@ source_set("public") {
     "navigation_item_list.mm",
     "navigation_manager.h",
     "reload_type.h",
+    "security/cert_policy.h",
+    "security/certificate_policy_cache.h",
+    "security/security_style.h",
+    "security/ssl_status.h",
+    "security/web_interstitial.h",
+    "security/web_interstitial_delegate.h",
     "serializable_user_data_manager.h",
     "service_manager_connection.h",
     "url_data_source_ios.h",

ios/web/public/certificate_policy_cache.h

+// 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.
+
+#ifndef IOS_WEB_PUBLIC_CERTIFICATE_POLICY_CACHE_H_
+#define IOS_WEB_PUBLIC_CERTIFICATE_POLICY_CACHE_H_
+
+#include "ios/web/public/security/certificate_policy_cache.h"
+
+#endif  // IOS_WEB_PUBLIC_CERTIFICATE_POLICY_CACHE_H_

ios/web/public/security/BUILD.gn

-# Copyright 2019 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.
-
-source_set("security") {
-  deps = [
-    "//base",
-    "//net",
-  ]
-
-  sources = [
-    "cert_policy.h",
-    "certificate_policy_cache.h",
-    "security_style.h",
-    "ssl_status.h",
-    "web_interstitial.h",
-    "web_interstitial_delegate.h",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}

ios/web/public/test/fakes/BUILD.gn

@@ -12,7 +12,6 @@ source_set("fakes") {
     "//ios/web/navigation:core",
     "//ios/web/public/download",
     "//ios/web/public/find_in_page",
-    "//ios/web/public/security",
     "//ios/web/test:test_constants",
     "//ios/web/web_state:web_frame",
     "//ios/web/web_state/ui:crw_web_view_navigation_proxy",

ios/web/security/BUILD.gn

@@ -13,7 +13,6 @@ source_set("security") {
     "//ios/web/navigation:core",
     "//ios/web/navigation:navigation_manager_util",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ios/web/web_state:web_state_impl_header",
     "//ios/web/web_state/ui:web_view_js_utils",
     "//net",
@@ -50,7 +49,6 @@ source_set("unittests") {
     "//ios/web",
     "//ios/web/navigation",
     "//ios/web/public",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//ios/web/test/fakes",

ios/web/test/fakes/BUILD.gn

@@ -10,8 +10,7 @@ source_set("fakes") {
     "//base",
     "//ios/web/navigation",
     "//ios/web/navigation:core",
-    "//ios/web/public",
-    "//ios/web/public/security",
+    "//ios/web/public:public",
     "//ios/web/web_state/ui:crw_web_view_navigation_proxy",
     "//ios/web/web_state/ui:wk_web_view_configuration_provider",
     "//testing/gmock",

ios/web/web_state/BUILD.gn

@@ -60,7 +60,6 @@ source_set("session_certificate_policy_cache") {
   deps = [
     "//base",
     "//ios/web/public",
-    "//ios/web/public/security",
   ]
 
   sources = [

ios/web/web_state/ui/BUILD.gn

@@ -24,7 +24,6 @@ source_set("ui") {
     "//ios/web/net:net",
     "//ios/web/public",
     "//ios/web/public/download",
-    "//ios/web/public/security",
     "//ios/web/security",
     "//ios/web/web_state:context_menu",
     "//ios/web/web_state:error_translation_util",

ios/web_view/BUILD.gn

@@ -309,7 +309,6 @@ ios_web_view_deps = [
   "//ios/web/common",
   "//ios/web/public",
   "//ios/web/public/app",
-  "//ios/web/public/security",
   "//ios/web/public/global_state",
   "//net",
   "//net:extras",
@@ -431,7 +430,6 @@ test("ios_web_view_unittests") {
     "//components/signin/core/browser:internals_test_support",
     "//components/signin/ios/browser:test_support",
     "//components/sync:test_support",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//services/identity/public/cpp:test_support",