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

This is a reland of daad88b Add temporary source files in target //ios/web/public:public to avoid breaking ios_internal. 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} Bug: 956511, 942244 Change-Id: Id7cc826f6e127dc21b2f88cb5d1adebf4ec91ea7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1630247 Reviewed-by: Mark Cogan <marq@chromium.org> Reviewed-by: Colin Blundell <blundell@chromium.org> Commit-Queue: Yi Su <mrsuyi@chromium.org> Cr-Commit-Position: refs/heads/master@{#663676}
Denger-Network · May 28, 2019 · 57eb432 · 57eb432
1 parent d5756a9
commit 57eb432
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 16 deletions.
diff --git a/components/autofill/ios/browser/BUILD.gn b/components/autofill/ios/browser/BUILD.gn
@@ -42,6 +42,7 @@ source_set("browser") {
     "//google_apis",
     "//ios/web/common",
     "//ios/web/public",
+    "//ios/web/public/security",
     "//services/network/public/cpp",
     "//ui/gfx/geometry",
   ]

diff --git a/components/security_state/ios/BUILD.gn b/components/security_state/ios/BUILD.gn
@@ -14,5 +14,6 @@ jumbo_source_set("ios") {
     "//base",
     "//components/security_state/core/",
     "//ios/web/public/",
+    "//ios/web/public/security",
   ]
 }
diff --git a/ios/chrome/browser/interstitials/BUILD.gn b/ios/chrome/browser/interstitials/BUILD.gn
@@ -26,6 +26,7 @@ source_set("interstitials") {
     "//ios/chrome/browser/ui/util",
     "//ios/web",
     "//ios/web/public",
+    "//ios/web/public/security",
     "//ui/base",
     "//url",
   ]

diff --git a/ios/chrome/browser/passwords/BUILD.gn b/ios/chrome/browser/passwords/BUILD.gn
@@ -190,6 +190,7 @@ 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",

diff --git a/ios/chrome/browser/payments/BUILD.gn b/ios/chrome/browser/payments/BUILD.gn
@@ -47,6 +47,7 @@ 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",

diff --git a/ios/chrome/browser/reading_list/BUILD.gn b/ios/chrome/browser/reading_list/BUILD.gn
@@ -48,6 +48,7 @@ source_set("reading_list") {
     "//ios/chrome/common",
     "//ios/web",
     "//ios/web/public",
+    "//ios/web/public/security",
     "//net",
     "//ui/base",
     "//url",

diff --git a/ios/chrome/browser/ssl/BUILD.gn b/ios/chrome/browser/ssl/BUILD.gn
@@ -41,6 +41,7 @@ source_set("ssl") {
     "//ios/public/provider/chrome/browser",
     "//ios/web/common",
     "//ios/web/public",
+    "//ios/web/public/security",
     "//net",
     "//ui/base",
     "//url",
@@ -74,6 +75,7 @@ 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",

diff --git a/ios/chrome/browser/tabs/BUILD.gn b/ios/chrome/browser/tabs/BUILD.gn
@@ -133,6 +133,7 @@ source_set("tabs_internal") {
     "//ios/public/provider/chrome/browser",
     "//ios/web",
     "//ios/web/public",
+    "//ios/web/public/security",
     "//net",
     "//ui/base",
     "//url",

diff --git a/ios/chrome/browser/ui/fullscreen/BUILD.gn b/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -100,6 +100,7 @@ source_set("internal") {
     "//ios/public/provider/chrome/browser/ui",
     "//ios/web",
     "//ios/web/common",
+    "//ios/web/public/security",
     "//ui/gfx/geometry",
   ]
 }
@@ -147,6 +148,7 @@ 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",

diff --git a/ios/chrome/browser/ui/location_bar/BUILD.gn b/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -73,6 +73,7 @@ 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",
@@ -108,6 +109,7 @@ 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" ]
 }

diff --git a/ios/chrome/browser/ui/page_info/BUILD.gn b/ios/chrome/browser/ui/page_info/BUILD.gn
@@ -30,6 +30,7 @@ source_set("page_info") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/web",
+    "//ios/web/public/security",
     "//ui/base",
     "//ui/gfx",
     "//url",

diff --git a/ios/chrome/browser/ui/payments/BUILD.gn b/ios/chrome/browser/ui/payments/BUILD.gn
@@ -92,6 +92,7 @@ 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",

diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn
@@ -44,6 +44,7 @@ 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",
@@ -318,6 +319,7 @@ 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",
@@ -407,6 +409,7 @@ 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",
@@ -587,6 +590,7 @@ 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",

diff --git a/ios/web/navigation/BUILD.gn b/ios/web/navigation/BUILD.gn
@@ -23,6 +23,7 @@ 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",
@@ -77,6 +78,7 @@ source_set("core") {
     "//components/url_formatter:url_formatter",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
+    "//ios/web/public/security",
     "//ui/base",
   ]
 

diff --git a/ios/web/net/BUILD.gn b/ios/web/net/BUILD.gn
@@ -10,6 +10,9 @@ source_set("net") {
     "//ios/net",
     "//ios/web:core",
     "//ios/web/public",
+    "//ios/web/public/security",
+    "//ios/web/security",
+    "//net",
   ]
 
   sources = [

diff --git a/ios/web/public/BUILD.gn b/ios/web/public/BUILD.gn
@@ -22,7 +22,6 @@ 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",
@@ -42,10 +41,6 @@ source_set("public") {
     "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",

diff --git a/ios/web/public/certificate_policy_cache.h b/ios/web/public/certificate_policy_cache.h
diff --git a/ios/web/public/security/BUILD.gn b/ios/web/public/security/BUILD.gn
@@ -0,0 +1,21 @@
+# 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" ]
+}
diff --git a/ios/web/public/test/fakes/BUILD.gn b/ios/web/public/test/fakes/BUILD.gn
@@ -12,6 +12,7 @@ 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",

diff --git a/ios/web/security/BUILD.gn b/ios/web/security/BUILD.gn
@@ -13,6 +13,7 @@ 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",
@@ -49,6 +50,7 @@ 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",

diff --git a/ios/web/test/fakes/BUILD.gn b/ios/web/test/fakes/BUILD.gn
@@ -10,7 +10,8 @@ source_set("fakes") {
     "//base",
     "//ios/web/navigation",
     "//ios/web/navigation:core",
-    "//ios/web/public:public",
+    "//ios/web/public",
+    "//ios/web/public/security",
     "//ios/web/web_state/ui:crw_web_view_navigation_proxy",
     "//ios/web/web_state/ui:wk_web_view_configuration_provider",
     "//testing/gmock",

diff --git a/ios/web/web_state/BUILD.gn b/ios/web/web_state/BUILD.gn
@@ -60,6 +60,7 @@ source_set("session_certificate_policy_cache") {
   deps = [
     "//base",
     "//ios/web/public",
+    "//ios/web/public/security",
   ]
 
   sources = [

diff --git a/ios/web/web_state/ui/BUILD.gn b/ios/web/web_state/ui/BUILD.gn
@@ -24,6 +24,7 @@ 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",

diff --git a/ios/web_view/BUILD.gn b/ios/web_view/BUILD.gn
@@ -309,6 +309,7 @@ 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",
@@ -430,6 +431,7 @@ 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",