Trust Tokens: Move browser tests to content/browser/net

The //chrome Trust Tokens browser tests live in //chrome/browser/net.
This change moves the //content Trust Tokens browser tests to
//content/browser/net to be consistent (and because Matt suggested it).

R=mmenke

Fixed: 1109279
Change-Id: I0556204718b6b8f26161c4e6ba0eb8204dd79bc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575224
Commit-Queue: David Van Cleve <davidvc@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Auto-Submit: David Van Cleve <davidvc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834309}

content/browser/devtools/devtools_trust_token_browsertest.cc

@@ -4,6 +4,7 @@
 
 #include "content/browser/devtools/protocol/devtools_protocol_test_support.h"
 #include "content/browser/devtools/protocol/network.h"
+#include "content/browser/net/trust_token_browsertest.h"
 #include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/browser_test.h"
@@ -11,7 +12,6 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/shell/browser/shell.h"
-#include "content/test/trust_token_browsertest.h"
 
 namespace content {
 

content/browser/net/DEPS

+specific_include_rules = {
+  "trust_token.*test.*": [
+    "+services/network/test",
+    "+services/network/trust_tokens/test",
+  ],
+}

content/browser/net/OWNERS

 file://net/OWNERS
 
+# Trust Tokens-related files.
+per-file *trust_token*=file://services/network/trust_tokens/OWNERS
+
 per-file network_quality*=file://net/nqe/OWNERS

content/test/trust_token_browsertest.cc → content/browser/net/trust_token_browsertest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/test/trust_token_browsertest.h"
+#include "content/browser/net/trust_token_browsertest.h"
 
 #include <memory>
 #include <string>

content/test/trust_token_browsertest.h → content/browser/net/trust_token_browsertest.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_TEST_TRUST_TOKEN_BROWSERTEST_H_
-#define CONTENT_TEST_TRUST_TOKEN_BROWSERTEST_H_
+#ifndef CONTENT_BROWSER_NET_TRUST_TOKEN_BROWSERTEST_H_
+#define CONTENT_BROWSER_NET_TRUST_TOKEN_BROWSERTEST_H_
 
 #include "base/test/scoped_feature_list.h"
 #include "content/public/test/content_browser_test.h"
@@ -61,4 +61,4 @@ class TrustTokenBrowsertest : virtual public ContentBrowserTest {
 
 }  // namespace content
 
-#endif  // CONTENT_TEST_TRUST_TOKEN_BROWSERTEST_H_
+#endif  // CONTENT_BROWSER_NET_TRUST_TOKEN_BROWSERTEST_H_

content/test/BUILD.gn

@@ -1070,6 +1070,10 @@ test("content_browsertests") {
     "../browser/net/net_command_line_flags_browsertest.cc",
     "../browser/net/network_field_trial_browsertest.cc",
     "../browser/net/split_cache_browsertest.cc",
+    "../browser/net/trust_token_browsertest.cc",
+    "../browser/net/trust_token_browsertest.h",
+    "../browser/net/trust_token_origin_trial_browsertest.cc",
+    "../browser/net/trust_token_parameters_browsertest.cc",
     "../browser/net_info_browsertest.cc",
     "../browser/network_service_browsertest.cc",
     "../browser/network_service_restart_browsertest.cc",
@@ -1213,10 +1217,6 @@ test("content_browsertests") {
     "../test/browser_test_utils_browsertest.cc",
     "../test/content_browser_test_test.cc",
     "../test/top_frame_population_browsertest.cc",
-    "../test/trust_token_browsertest.cc",
-    "../test/trust_token_browsertest.h",
-    "../test/trust_token_origin_trial_browsertest.cc",
-    "../test/trust_token_parameters_browsertest.cc",
     "../test/url_loader_interceptor_test.cc",
     "../test/webui_resource_browsertest.cc",
   ]

content/test/DEPS

@@ -27,7 +27,6 @@ include_rules = [
   "+services/network/public/cpp",
   "+services/network/public/mojom",
   "+services/network/test",
-  "+services/network/trust_tokens/test",
   "+services/network/mock_mojo_dhcp_wpad_url_client.h",
   "+services/network/url_request_context_builder_mojo.h",
   "+services/proxy_resolver",

content/test/OWNERS

@@ -21,9 +21,6 @@ per-file dwrite_*=drott@chromium.org
 # Badging related files.
 per-file mock_badge_service.*=file://chrome/browser/badging/OWNERS
 
-# Trust Tokens-related files.
-per-file *trust_token*=file://services/network/trust_tokens/OWNERS
-
 # Fuchsia related files.
 per-file *fuchsia*=file://build/fuchsia/OWNERS