Put net/server/* into a separate BUILD.gn file

net::HttpServer is being deprecated. This CL puts them into a separate target
with limited visibility and adds comments.

TBR=dgozman@chromium.org

Bug: 721401

Change-Id: Id2a5be800ec0ceccb94d3a9987adc96d14e7f8b7
Reviewed-on: https://chromium-review.googlesource.com/1076498
Commit-Queue: Helen Li <xunjieli@chromium.org>
Reviewed-by: Helen Li <xunjieli@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567438}

chrome/browser/devtools/BUILD.gn

@@ -109,7 +109,7 @@ static_library("devtools") {
       "//chrome/app/theme:theme_resources",
       "//chrome/common",
       "//components/viz/host",
-      "//net:http_server",
+      "//net/server:http_server",
       "//skia",
       "//third_party/icu",
       "//third_party/leveldatabase",

chrome/test/chromedriver/BUILD.gn

@@ -290,7 +290,7 @@ source_set("lib") {
     "//chrome/common:version_header",
     "//crypto",
     "//net",
-    "//net:http_server",
+    "//net/server:http_server",
     "//third_party/zlib",
     "//ui/base",
     "//ui/events:dom_keycode_converter",
@@ -403,8 +403,8 @@ test("chromedriver_unittests") {
     "//base",
     "//base/test:run_all_unittests",
     "//net",
-    "//net:http_server",
     "//net:test_support",
+    "//net/server:http_server",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/base",
@@ -434,8 +434,8 @@ test("chromedriver_tests") {
     "//base",
     "//base/test:run_all_unittests",
     "//net",
-    "//net:http_server",
     "//net:test_support",
+    "//net/server:http_server",
     "//testing/gtest",
     "//ui/events:test_support",
     "//url",

content/browser/BUILD.gn

@@ -117,7 +117,7 @@ jumbo_source_set("browser") {
     "//mojo/public/js:resources",
     "//net",
     "//net:extras",
-    "//net:http_server",
+    "//net/server:http_server",
     "//ppapi/buildflags",
     "//printing/buildflags",
     "//services/audio:lib",

net/BUILD.gn

@@ -2321,28 +2321,6 @@ if (!is_proto_quic) {
   }
 }
 
-static_library("http_server") {
-  sources = [
-    "server/http_connection.cc",
-    "server/http_connection.h",
-    "server/http_server.cc",
-    "server/http_server.h",
-    "server/http_server_request_info.cc",
-    "server/http_server_request_info.h",
-    "server/http_server_response_info.cc",
-    "server/http_server_response_info.h",
-    "server/web_socket.cc",
-    "server/web_socket.h",
-    "server/web_socket_encoder.cc",
-    "server/web_socket_encoder.h",
-  ]
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
-  deps = [
-    ":net",
-    "//base",
-  ]
-}
-
 if (!is_ios) {
   executable("dump_cache") {
     testonly = true
@@ -5334,6 +5312,10 @@ test("net_unittests") {
     "//url:url_features",
   ]
 
+  if (enable_websockets) {
+    deps += [ "//net/server:tests" ]
+  }
+
   if (is_posix || is_fuchsia) {
     sources += [ "socket/udp_socket_posix_unittest.cc" ]
   }
@@ -5503,10 +5485,6 @@ test("net_unittests") {
 
   if (enable_websockets) {
     sources += [
-      "server/http_connection_unittest.cc",
-      "server/http_server_response_info_unittest.cc",
-      "server/http_server_unittest.cc",
-      "server/web_socket_encoder_unittest.cc",
       "websockets/websocket_basic_stream_adapters_test.cc",
       "websockets/websocket_basic_stream_test.cc",
       "websockets/websocket_channel_test.cc",
@@ -5530,7 +5508,6 @@ test("net_unittests") {
       "websockets/websocket_test_util.cc",
       "websockets/websocket_test_util.h",
     ]
-    deps += [ ":http_server" ]
   }
 
   if (disable_file_support) {
@@ -6255,21 +6232,6 @@ fuzzer_test("net_http_transport_security_state_static_fuzzer") {
       "data/fuzzer_dictionaries/net_http_transport_security_state_fuzzer.dict"
 }
 
-fuzzer_test("net_http_server_fuzzer") {
-  sources = [
-    "server/http_server_fuzzer.cc",
-  ]
-  deps = [
-    ":http_server",
-    ":net_fuzzer_test_support",
-    ":test_support",
-    "//base",
-    "//net",
-  ]
-  dict = "data/fuzzer_dictionaries/net_http_server_fuzzer.dict"
-  seed_corpus = "data/fuzzer_data/http_server_requests/"
-}
-
 fuzzer_test("net_spdy_session_fuzzer") {
   sources = [
     "spdy/spdy_session_fuzzer.cc",

net/server/BUILD.gn

+# Copyright 2018 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.
+
+import("//net/features.gni")
+import("//testing/libfuzzer/fuzzer_test.gni")
+
+static_library("http_server") {
+  public = []
+
+  # This target is being deprecated. Use //services/network/public/cpp/server
+  # instead.
+  visibility = [
+    ":net_http_server_fuzzer",
+    ":tests",
+    "//chrome/browser/devtools",
+    "//chrome/test/chromedriver/*",
+    "//content/browser",
+  ]
+
+  friend = [
+    ":net_http_server_fuzzer",
+    ":tests",
+    "//chrome/browser/devtools",
+    "//chrome/test/chromedriver/*",
+    "//content/browser",
+  ]
+
+  if (enable_websockets) {
+    sources = [
+      "http_connection.cc",
+      "http_connection.h",
+      "http_server.cc",
+      "http_server.h",
+      "http_server_request_info.cc",
+      "http_server_request_info.h",
+      "http_server_response_info.cc",
+      "http_server_response_info.h",
+      "web_socket.cc",
+      "web_socket.h",
+      "web_socket_encoder.cc",
+      "web_socket_encoder.h",
+    ]
+    configs += [ "//build/config/compiler:wexit_time_destructors" ]
+    deps = [
+      "//base",
+      "//net",
+    ]
+  }
+}
+
+source_set("tests") {
+  testonly = true
+  if (enable_websockets) {
+    sources = [
+      "http_connection_unittest.cc",
+      "http_server_response_info_unittest.cc",
+      "http_server_unittest.cc",
+      "web_socket_encoder_unittest.cc",
+    ]
+    deps = [
+      ":http_server",
+      "//base",
+      "//net",
+      "//net:test_support",
+      "//testing/gtest",
+    ]
+  }
+}
+
+if (enable_websockets) {
+  fuzzer_test("net_http_server_fuzzer") {
+    sources = [
+      "http_server_fuzzer.cc",
+    ]
+    deps = [
+      ":http_server",
+      "//base",
+      "//net",
+      "//net:net_fuzzer_test_support",
+      "//net:test_support",
+    ]
+    dict = "//net/data/fuzzer_dictionaries/net_http_server_fuzzer.dict"
+    seed_corpus = "//net/data/fuzzer_data/http_server_requests/"
+  }
+}