diff --git a/tests/ceftests/cookie_unittest.cc b/tests/ceftests/cookie_unittest.cc
index af3f102e6..1744e1090 100644
--- a/tests/ceftests/cookie_unittest.cc
+++ b/tests/ceftests/cookie_unittest.cc
@@ -1321,8 +1321,8 @@ class CookieAccessServerHandler : public test_server::ObserverHelper,
     delete this;
   }
 
-  bool OnHttpRequest(CefRefPtr<CefRequest> request,
-                     const ResponseCallback& response_callback) override {
+  bool OnTestServerRequest(CefRefPtr<CefRequest> request,
+                           const ResponseCallback& response_callback) override {
     EXPECT_UI_THREAD();
 
     // Log the requests for better error reporting.
diff --git a/tests/ceftests/cors_unittest.cc b/tests/ceftests/cors_unittest.cc
index 5db44e804..464032adb 100644
--- a/tests/ceftests/cors_unittest.cc
+++ b/tests/ceftests/cors_unittest.cc
@@ -313,8 +313,8 @@ class TestServerObserver : public test_server::ObserverHelper {
     std::move(ready_callback_).Run();
   }
 
-  bool OnHttpRequest(CefRefPtr<CefRequest> request,
-                     const ResponseCallback& response_callback) override {
+  bool OnTestServerRequest(CefRefPtr<CefRequest> request,
+                           const ResponseCallback& response_callback) override {
     CEF_REQUIRE_UI_THREAD();
     Resource* resource = setup_->GetResource(request);
     if (!resource) {
diff --git a/tests/ceftests/test_server_manager.cc b/tests/ceftests/test_server_manager.cc
index 0080eb9df..3a9f7667c 100644
--- a/tests/ceftests/test_server_manager.cc
+++ b/tests/ceftests/test_server_manager.cc
@@ -253,8 +253,8 @@ void Manager::OnServerHandlerDeleted() {
   delete this;
 }
 
-void Manager::OnHttpRequest(CefRefPtr<CefRequest> request,
-                            const ResponseCallback& response_callback) {
+void Manager::OnTestServerRequest(CefRefPtr<CefRequest> request,
+                                  const ResponseCallback& response_callback) {
   CEF_REQUIRE_UI_THREAD();
 
   // TODO(chrome-runtime): Debug why favicon requests don't always have the
@@ -276,7 +276,7 @@ void Manager::OnHttpRequest(CefRefPtr<CefRequest> request,
 
   ObserverList::const_iterator it = list.begin();
   for (; it != list.end(); ++it) {
-    if ((*it)->OnHttpRequest(request, response_callback)) {
+    if ((*it)->OnTestServerRequest(request, response_callback)) {
       handled = true;
       break;
     }
diff --git a/tests/ceftests/test_server_manager.h b/tests/ceftests/test_server_manager.h
index d28890693..9432b84d8 100644
--- a/tests/ceftests/test_server_manager.h
+++ b/tests/ceftests/test_server_manager.h
@@ -74,8 +74,8 @@ class Manager : public Runner::Delegate {
   void OnServerCreated(const std::string& server_origin) override;
   void OnServerDestroyed() override;
   void OnServerHandlerDeleted() override;
-  void OnHttpRequest(CefRefPtr<CefRequest> request,
-                     const ResponseCallback& response_callback) override;
+  void OnTestServerRequest(CefRefPtr<CefRequest> request,
+                           const ResponseCallback& response_callback) override;
 
  private:
   const bool https_server_;
diff --git a/tests/ceftests/test_server_observer.h b/tests/ceftests/test_server_observer.h
index cf2fdd460..75d4070e3 100644
--- a/tests/ceftests/test_server_observer.h
+++ b/tests/ceftests/test_server_observer.h
@@ -30,8 +30,9 @@ class Observer {
   // Return true and execute |response_callback| either synchronously or
   // asynchronously if the request was handled. Do not execute
   // |response_callback| when returning false.
-  virtual bool OnHttpRequest(CefRefPtr<CefRequest> request,
-                             const ResponseCallback& response_callback) = 0;
+  virtual bool OnTestServerRequest(
+      CefRefPtr<CefRequest> request,
+      const ResponseCallback& response_callback) = 0;
 
  protected:
   virtual ~Observer() = default;
diff --git a/tests/ceftests/test_server_observer_unittest.cc b/tests/ceftests/test_server_observer_unittest.cc
index a675d93f5..23db079b3 100644
--- a/tests/ceftests/test_server_observer_unittest.cc
+++ b/tests/ceftests/test_server_observer_unittest.cc
@@ -73,8 +73,8 @@ class TestServerObserver : public test_server::ObserverHelper {
                                       weak_ptr_factory_.GetWeakPtr()));
   }
 
-  bool OnHttpRequest(CefRefPtr<CefRequest> request,
-                     const ResponseCallback& response_callback) override {
+  bool OnTestServerRequest(CefRefPtr<CefRequest> request,
+                           const ResponseCallback& response_callback) override {
     CEF_REQUIRE_UI_THREAD();
     const std::string& url = request->GetURL();
     if (url != url_)
diff --git a/tests/ceftests/test_server_runner.h b/tests/ceftests/test_server_runner.h
index 250eeb83a..045417023 100644
--- a/tests/ceftests/test_server_runner.h
+++ b/tests/ceftests/test_server_runner.h
@@ -31,8 +31,9 @@ class Runner {
     virtual void OnServerHandlerDeleted() = 0;
 
     // Server request notification.
-    virtual void OnHttpRequest(CefRefPtr<CefRequest> request,
-                               const ResponseCallback& response_callback) = 0;
+    virtual void OnTestServerRequest(
+        CefRefPtr<CefRequest> request,
+        const ResponseCallback& response_callback) = 0;
 
    protected:
     virtual ~Delegate() = default;
diff --git a/tests/ceftests/test_server_runner_normal.cc b/tests/ceftests/test_server_runner_normal.cc
index 87d40689a..c261af0c4 100644
--- a/tests/ceftests/test_server_runner_normal.cc
+++ b/tests/ceftests/test_server_runner_normal.cc
@@ -59,7 +59,7 @@ class ServerHandler : public CefServerHandler {
                      const CefString& client_address,
                      CefRefPtr<CefRequest> request) override {
     EXPECT_TRUE(server->GetTaskRunner()->BelongsToCurrentThread());
-    NotifyHttpRequest(server, connection_id, client_address, request);
+    NotifyTestServerRequest(server, connection_id, client_address, request);
   }
 
   void OnWebSocketRequest(CefRefPtr<CefServer> server,
@@ -95,20 +95,20 @@ class ServerHandler : public CefServerHandler {
     delegate_->OnServerDestroyed();
   }
 
-  void NotifyHttpRequest(CefRefPtr<CefServer> server,
-                         int connection_id,
-                         const CefString& client_address,
-                         CefRefPtr<CefRequest> request) {
+  void NotifyTestServerRequest(CefRefPtr<CefServer> server,
+                               int connection_id,
+                               const CefString& client_address,
+                               CefRefPtr<CefRequest> request) {
     if (!CefCurrentlyOn(TID_UI)) {
-      CefPostTask(TID_UI, base::BindOnce(&ServerHandler::NotifyHttpRequest,
-                                         this, server, connection_id,
-                                         client_address, request));
+      CefPostTask(TID_UI, base::BindOnce(
+                              &ServerHandler::NotifyTestServerRequest, this,
+                              server, connection_id, client_address, request));
       return;
     }
 
     auto response_callback = base::BindRepeating(&ServerHandler::SendResponse,
                                                  server, connection_id);
-    delegate_->OnHttpRequest(request, response_callback);
+    delegate_->OnTestServerRequest(request, response_callback);
   }
 
   static void SendResponse(CefRefPtr<CefServer> server,
diff --git a/tests/ceftests/test_server_runner_test.cc b/tests/ceftests/test_server_runner_test.cc
index e88ecf14e..df5543660 100644
--- a/tests/ceftests/test_server_runner_test.cc
+++ b/tests/ceftests/test_server_runner_test.cc
@@ -54,7 +54,7 @@ class ServerHandler : public CefTestServerHandler {
       CefRefPtr<CefTestServer> server,
       CefRefPtr<CefRequest> request,
       CefRefPtr<CefTestServerConnection> connection) override {
-    NotifyHttpRequest(request, connection);
+    NotifyTestServerRequest(request, connection);
     return true;
   }
 
@@ -69,17 +69,18 @@ class ServerHandler : public CefTestServerHandler {
     delegate_->OnServerDestroyed();
   }
 
-  void NotifyHttpRequest(CefRefPtr<CefRequest> request,
-                         CefRefPtr<CefTestServerConnection> connection) {
+  void NotifyTestServerRequest(CefRefPtr<CefRequest> request,
+                               CefRefPtr<CefTestServerConnection> connection) {
     if (!CefCurrentlyOn(TID_UI)) {
-      CefPostTask(TID_UI, base::BindOnce(&ServerHandler::NotifyHttpRequest,
-                                         this, request, connection));
+      CefPostTask(TID_UI,
+                  base::BindOnce(&ServerHandler::NotifyTestServerRequest, this,
+                                 request, connection));
       return;
     }
 
     auto response_callback =
         base::BindRepeating(&ServerHandler::SendResponse, connection);
-    delegate_->OnHttpRequest(request, response_callback);
+    delegate_->OnTestServerRequest(request, response_callback);
   }
 
   static void SendResponse(CefRefPtr<CefTestServerConnection> connection,
diff --git a/tests/ceftests/urlrequest_unittest.cc b/tests/ceftests/urlrequest_unittest.cc
index d6387f6e5..e2ab02561 100644
--- a/tests/ceftests/urlrequest_unittest.cc
+++ b/tests/ceftests/urlrequest_unittest.cc
@@ -1303,8 +1303,8 @@ class RequestServerHandler : public test_server::ObserverHelper {
     delete this;
   }
 
-  bool OnHttpRequest(CefRefPtr<CefRequest> request,
-                     const ResponseCallback& response_callback) override {
+  bool OnTestServerRequest(CefRefPtr<CefRequest> request,
+                           const ResponseCallback& response_callback) override {
     EXPECT_UI_THREAD();
 
     // Log the requests for better error reporting.