[iOS] Make net:test_support dependencies in egtests explicit.

ChromeTestCase exposes an EmbeddedTestServer property for use by tests,
and includes the header for that class in its own header. This means
that tests can (and do) use symbols from EmbeddedTestServer without
explicitly including them. To make this work, //net:test_support is
a public dependency of the egtest test_support targets, so the individual
egtest targets can link correctly.

This is in general not in line with our "include what you use" policy,
which would prefer that code which uses symbols from an API directly
includes the header for that API, and explicitly declares it as a dep
in gn.

This CL:

  - Makes the test_support dependencies on //net:test_support private.
  - Changes the EmbeddedTestServer header include in chrome_test_case.h
    to be a forward declaration.
  - Updates nineteen egtest.mm files to explicitly include the
    EmbeddedTestServer header.
  - Updates twenty-seven targets in BUILD.gn files to have add a
    //net:test_support as a dependency.


Change-Id: Iea336c66a1a7423732e3aaedcf865882b7ac3a0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1892814
Commit-Queue: Mark Cogan <marq@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712100}

ios/chrome/browser/autofill/automation/BUILD.gn

@@ -30,6 +30,7 @@ source_set("eg_tests") {
     "//ios/web/public/js_messaging",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server:http_server",
+    "//net:test_support",
   ]
   libs = [ "XCTest.framework" ]
 }

ios/chrome/browser/context_menu/BUILD.gn

@@ -24,6 +24,7 @@ source_set("eg_tests") {
     "//ios/web/public",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//url",
   ]
   libs = [

ios/chrome/browser/context_menu/context_menu_egtest.mm

@@ -26,6 +26,7 @@
 #include "ios/web/public/test/element_selector.h"
 #import "ios/web/public/ui/crw_web_view_proxy.h"
 #import "ios/web/public/web_state.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "url/gurl.h"

ios/chrome/browser/feature_engagement/BUILD.gn

@@ -49,6 +49,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]

ios/chrome/browser/metrics/BUILD.gn

@@ -225,6 +225,7 @@ source_set("eg_tests") {
     "//ios/web/public/test",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]
@@ -249,6 +250,7 @@ source_set("test_support") {
     "//ios/chrome/test:eg_test_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//net:test_support",
     "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]

ios/chrome/browser/passwords/BUILD.gn

@@ -220,6 +220,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
   libs = [
     "UIKit.framework",
@@ -246,6 +247,7 @@ source_set("eg2_tests") {
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
   libs = [ "UIKit.framework" ]
 }

ios/chrome/browser/passwords/credential_manager_egtest.mm

@@ -24,6 +24,7 @@
 #import "ios/testing/earl_grey/earl_grey_test.h"
 #import "ios/web/public/test/http_server/http_server.h"
 #include "ios/web/public/test/http_server/http_server_util.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/prerender/BUILD.gn

@@ -73,6 +73,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
   libs = [
     "UIKit.framework",

ios/chrome/browser/prerender/prerender_egtest.mm

@@ -12,6 +12,7 @@
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 

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

@@ -162,6 +162,7 @@ source_set("eg_test_support") {
   deps = [
     ":authentication",
     "unified_consent",
+    "//base/test:test_support",
     "//components/signin/public/identity_manager",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/browser_state",

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

@@ -162,7 +162,9 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/web/public/js_messaging",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//services/network:test_support",
+    "//testing/gtest:gtest",
   ]
   libs = [
     "UIKit.framework",

ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn

@@ -225,6 +225,7 @@ source_set("eg_tests") {
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
 }
 

ios/chrome/browser/ui/autofill/manual_fill/keyboard_observer_egtest.mm

@@ -13,6 +13,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/chrome/test/scoped_eg_synchronization_disabler.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

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

@@ -311,6 +311,7 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//testing/gmock",
     "//ui/strings",
   ]

ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm

@@ -22,6 +22,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
 #import "net/base/mac/url_conversions.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/strings/grit/ui_strings.h"

ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm

@@ -17,6 +17,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/chrome/test/scoped_eg_synchronization_disabler.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/base/l10n/l10n_util.h"

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

@@ -153,6 +153,7 @@ source_set("eg_tests") {
     "//ios/web/public/test",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]

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

@@ -134,6 +134,7 @@ source_set("eg_tests") {
     "//ios/web:earl_grey_test_support",
     "//ios/web/public",
     "//ios/web/public/test:element_selector",
+    "//net:test_support",
     "//ui/base",
   ]
   libs = [ "XCTest.framework" ]

ios/chrome/browser/ui/download/ar_quick_look_egtest.mm

@@ -12,6 +12,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
 #include "net/http/http_status_code.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/download/pass_kit_egtest.mm

@@ -14,6 +14,7 @@
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/base/l10n/l10n_util_mac.h"

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

@@ -174,6 +174,7 @@ source_set("eg_tests") {
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
     "//net",
+    "//net:test_support",
     "//ui/base",
   ]
   libs = [

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

@@ -16,6 +16,7 @@ source_set("eg2_tests") {
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
+    "//net:test_support",
     "//ui/base",
   ]
   libs = [

ios/chrome/browser/ui/integration_tests/pdf_egtest.mm

@@ -10,6 +10,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

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

@@ -207,6 +207,7 @@ source_set("eg_tests") {
     "//ios/testing:hardware_keyboarr_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
+    "//net:test_support",
     "//testing/gmock",
     "//ui/base",
   ]

ios/chrome/browser/ui/omnibox/omnibox_egtest.mm

@@ -17,6 +17,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers_app_interface.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/hardware_keyboard_util.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/base/l10n/l10n_util.h"

ios/chrome/browser/ui/omnibox/popup/BUILD.gn

@@ -174,6 +174,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
+    "//net:test_support",
     "//testing/gmock",
   ]
   libs = [ "XCTest.framework" ]

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm

@@ -13,6 +13,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 

ios/chrome/browser/ui/omnibox/popup/shortcuts/shortcuts_egtest.mm

@@ -15,6 +15,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 

ios/chrome/browser/ui/open_in/open_in_controller_egtest.mm

@@ -13,6 +13,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

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

@@ -315,6 +315,7 @@ source_set("eg_tests") {
     "//ios/third_party/material_components_ios",
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//testing/gtest",
     "//third_party/libaddressinput:strings_grit",
     "//ui/base",

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

@@ -201,6 +201,7 @@ source_set("eg_tests") {
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
     "//net",
+    "//net:test_support",
   ]
   libs = [
     "UIKit.framework",

ios/chrome/browser/ui/settings/autofill/BUILD.gn

@@ -127,6 +127,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
+    "//net:test_support",
     "//ui/base",
   ]
 }

ios/chrome/browser/ui/settings/language/BUILD.gn

@@ -100,6 +100,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//net:test_support",
     "//ui/strings:ui_strings_grit",
   ]
 }

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

@@ -88,6 +88,7 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
   libs = [ "XCTest.framework" ]
 }

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

@@ -157,6 +157,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
   libs = [ "UIKit.framework" ]
 }

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

@@ -261,6 +261,7 @@ source_set("eg_tests") {
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//ui/base",
   ]
   libs = [ "XCTest.framework" ]

ios/chrome/browser/ui/toolbar/adaptive_toolbar_egtest.mm

@@ -18,6 +18,7 @@
 #import "ios/testing/earl_grey/disabled_test_macros.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
 #include "ios/web/public/test/element_selector.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/base/l10n/l10n_util_mac.h"

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

@@ -137,6 +137,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/web",
     "//ios/web/public/test:element_selector",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]

ios/chrome/browser/ui/webui/inspect/inspect_ui_egtest.mm

@@ -14,6 +14,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #include "ios/web/public/test/element_selector.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/webui/web_ui_egtest.mm

@@ -19,6 +19,7 @@
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/web/public/web_client.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/device_form_factor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/scheme_host_port.h"

ios/chrome/browser/web/child_window_open_by_dom_egtest.mm

@@ -11,6 +11,7 @@
 #import "ios/testing/earl_grey/earl_grey_test.h"
 #import "ios/web/public/test/http_server/http_server.h"
 #include "ios/web/public/test/http_server/http_server_util.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 

ios/chrome/browser/web/navigation_egtest.mm

@@ -9,6 +9,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #include "ios/net/url_test_util.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ui/base/l10n/l10n_util.h"

ios/chrome/browser/web/tab_order_egtest.mm

@@ -10,6 +10,7 @@
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/earl_grey_test.h"
 #import "ios/web/public/test/element_selector.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/test/earl_grey/BUILD.gn

@@ -293,6 +293,7 @@ source_set("test_support") {
     "//ios/web/public/deprecated",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//services/metrics/public/cpp:metrics_cpp",
     "//ui/base",
     "//ui/base:test_support",
@@ -306,7 +307,6 @@ source_set("test_support") {
     "//ios/third_party/gtx:gtx+link",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
-    "//net:test_support",
   ]
 
   libs = [
@@ -487,11 +487,8 @@ source_set("eg_test_support+eg2") {
     "//ios/third_party/gtx:gtx+link",
     "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]
-
-  public_deps = [
-    "//net:test_support",
-  ]
 }

ios/chrome/test/earl_grey/chrome_test_case.h

@@ -10,7 +10,12 @@
 #import "base/ios/block_types.h"
 #import "ios/testing/earl_grey/base_earl_grey_test_case.h"
 #import "ios/testing/earl_grey/disabled_test_macros.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
+
+namespace net {
+namespace test_server {
+class EmbeddedTestServer;
+}
+}
 
 // Base class for all Chrome Earl Grey tests.
 @interface ChromeTestCase : BaseEarlGreyTestCase