[ads] NetworkClient code health (#32600)

PR renames NetworkClient::UrlRequest to
NetworkClient::SendRequest and
UrlRequestCallback to SendRequestCallback.

components/brave_ads/browser/ads_service_impl.cc

@@ -1546,7 +1546,7 @@ void AdsServiceImpl::GetSiteHistory(int max_count,
 void AdsServiceImpl::UrlRequest(mojom::UrlRequestInfoPtr url_request,
                                 UrlRequestCallback callback) {
   if (network_client_) {
-    network_client_->UrlRequest(std::move(url_request), std::move(callback));
+    network_client_->SendRequest(std::move(url_request), std::move(callback));
   }
 }
 

components/brave_ads/core/browser/service/BUILD.gn

@@ -10,6 +10,7 @@ source_set("service") {
     "ads_service_observer.h",
     "network_client.cc",
     "network_client.h",
+    "network_client_callback.h",
     "network_client_util.cc",
     "network_client_util.h",
     "new_tab_page_ad_prefetcher.cc",

components/brave_ads/core/browser/service/network_client.cc

@@ -26,7 +26,7 @@ namespace {
 
 void ReportError(const GURL& url,
                  int response_code,
-                 UrlRequestCallback callback) {
+                 SendRequestCallback callback) {
   auto mojom_url_response = mojom::UrlResponseInfo::New();
   mojom_url_response->url = url;
   mojom_url_response->code = response_code;
@@ -43,8 +43,8 @@ NetworkClient::NetworkClient(
 
 NetworkClient::~NetworkClient() = default;
 
-void NetworkClient::UrlRequest(mojom::UrlRequestInfoPtr mojom_url_request,
-                               UrlRequestCallback callback) {
+void NetworkClient::SendRequest(mojom::UrlRequestInfoPtr mojom_url_request,
+                                SendRequestCallback callback) {
   return HttpRequest(std::move(mojom_url_request), std::move(callback));
 }
 
@@ -56,7 +56,7 @@ void NetworkClient::CancelRequests() {
 ///////////////////////////////////////////////////////////////////////////////
 
 void NetworkClient::HttpRequest(mojom::UrlRequestInfoPtr mojom_url_request,
-                                UrlRequestCallback callback) {
+                                SendRequestCallback callback) {
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = mojom_url_request->url;
   resource_request->method = ToString(mojom_url_request->method);
@@ -88,7 +88,7 @@ void NetworkClient::HttpRequest(mojom::UrlRequestInfoPtr mojom_url_request,
 
 void NetworkClient::HttpRequestCallback(
     network::SimpleURLLoader* url_loader,
-    UrlRequestCallback callback,
+    SendRequestCallback callback,
     std::optional<std::string> response_body) {
   CHECK(url_loader);
 

components/brave_ads/core/browser/service/network_client.h

@@ -14,8 +14,8 @@
 #include "base/containers/unique_ptr_adapters.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
+#include "brave/components/brave_ads/core/browser/service/network_client_callback.h"
 #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h"
-#include "brave/components/brave_ads/core/public/network_client_callback.h"
 #include "services/network/public/cpp/network_context_getter.h"
 
 namespace network {
@@ -40,8 +40,8 @@ class NetworkClient {
   // Starts a network request for the given `mojom::UrlRequestInfo`. The
   // provided `callback` will be invoked with a `mojom::UrlResponseInfo` unless
   // the request is canceled or the `NetworkClient` is destroyed.
-  void UrlRequest(mojom::UrlRequestInfoPtr mojom_url_request,
-                  UrlRequestCallback callback);
+  void SendRequest(mojom::UrlRequestInfoPtr mojom_url_request,
+                   SendRequestCallback callback);
 
   // Cancels all ongoing network requests. Pending callbacks will not be
   // invoked.
@@ -49,9 +49,9 @@ class NetworkClient {
 
  private:
   void HttpRequest(mojom::UrlRequestInfoPtr mojom_url_request,
-                   UrlRequestCallback callback);
+                   SendRequestCallback callback);
   void HttpRequestCallback(network::SimpleURLLoader* url_loader,
-                           UrlRequestCallback callback,
+                           SendRequestCallback callback,
                            std::optional<std::string> response_body);
 
   const scoped_refptr<network::SharedURLLoaderFactory>

components/brave_ads/core/browser/service/network_client_callback.h

@@ -3,16 +3,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_NETWORK_CLIENT_CALLBACK_H_
-#define BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_NETWORK_CLIENT_CALLBACK_H_
+#ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_BROWSER_SERVICE_NETWORK_CLIENT_CALLBACK_H_
+#define BRAVE_COMPONENTS_BRAVE_ADS_CORE_BROWSER_SERVICE_NETWORK_CLIENT_CALLBACK_H_
 
 #include "base/functional/callback_forward.h"
 #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h"
 
 namespace brave_ads {
 
-using UrlRequestCallback = base::OnceCallback<void(mojom::UrlResponseInfoPtr)>;
+using SendRequestCallback = base::OnceCallback<void(mojom::UrlResponseInfoPtr)>;
 
 }  // namespace brave_ads
 
-#endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_PUBLIC_NETWORK_CLIENT_CALLBACK_H_
+#endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_BROWSER_SERVICE_NETWORK_CLIENT_CALLBACK_H_

components/brave_ads/core/public/BUILD.gn

@@ -36,7 +36,6 @@ source_set("headers") {
     "history/ad_history_item_info.h",
     "history/ad_history_item_value_util.h",
     "history/site_history.h",
-    "network_client_callback.h",
     "prefs/obsolete_pref_util.h",
     "prefs/pref_names.h",
     "prefs/pref_registry.h",