Move NetworkInterceptor to main devtools package

java/CHANGELOG

@@ -2,6 +2,7 @@ v4.0.0-rc-2
 ===========
 
 * Supported CDP versions: 85, 92, 93
+* Moved NetworkInterceptor to org.opeqa.selenium.devtools
 * NetworkInterceptor now takes a Filter to allow responses to be
   captured and rewritten.
 * Added a "relay" option to better support forwarding sessions to

java/src/org/openqa/selenium/support/devtools/NetworkInterceptor.java → java/src/org/openqa/selenium/devtools/NetworkInterceptor.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.support.devtools;
+package org.openqa.selenium.devtools;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.devtools.DevTools;
@@ -57,6 +57,10 @@
  */
 public class NetworkInterceptor implements AutoCloseable {
 
+  /**
+   * Return this from a {@link Routable} in order to have the browser
+   * continue the request unmodified.
+   */
   public static final HttpResponse PROCEED_WITH_REQUEST = new HttpResponse()
     .addHeader("Selenium-Interceptor", "Continue")
     .setContent(utf8String("Original request should proceed"));

java/src/org/openqa/selenium/support/BUILD.bazel

@@ -16,7 +16,6 @@ java_export(
     visibility = ["//visibility:public"],
     exports = [
         ":page-factory",
-        "//java/src/org/openqa/selenium/support/devtools",
         "//java/src/org/openqa/selenium/support/events",
         "//java/src/org/openqa/selenium/support/locators",
         "//java/src/org/openqa/selenium/support/ui:clock",

java/test/org/openqa/selenium/devtools/BUILD.bazel

@@ -16,13 +16,14 @@ java_selenium_test_suite(
     deps = [
         ":test-lib",
         "//java/src/org/openqa/selenium/devtools",
+        "//java/src/org/openqa/selenium/grid/security",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         "//java/src/org/openqa/selenium/support",
         "//java/test/org/openqa/selenium/environment",
         "//java/test/org/openqa/selenium/testing:annotations",
         "//java/test/org/openqa/selenium/testing:test-base",
-        "//java/src/org/openqa/selenium/grid/security",
+        "//java/test/org/openqa/selenium/testing/drivers",
         artifact("com.google.guava:guava"),
         artifact("junit:junit"),
         artifact("org.assertj:assertj-core"),

java/test/org/openqa/selenium/devtools/CdpFacadeTest.java

@@ -29,7 +29,6 @@
 import org.openqa.selenium.remote.http.Contents;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.Route;
-import org.openqa.selenium.support.devtools.NetworkInterceptor;
 import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.drivers.Browser;
 

java/test/org/openqa/selenium/support/devtools/NetworkInterceptorTest.java → java/test/org/openqa/selenium/devtools/NetworkInterceptorTest.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.support.devtools;
+package org.openqa.selenium.devtools;
 
 import com.google.common.net.MediaType;
 import org.junit.After;
@@ -25,6 +25,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.devtools.HasDevTools;
+import org.openqa.selenium.devtools.NetworkInterceptor;
 import org.openqa.selenium.environment.webserver.NettyAppServer;
 import org.openqa.selenium.remote.http.Contents;
 import org.openqa.selenium.remote.http.Filter;