Remove country from SafeSearchUrlCheckerClient, param that was only used by supervised users

Supervised users are not longer calling SafeSearchUrlCheckerClient (crbug/940454).

Bug: 936432
Change-Id: I34ae41f052a794d896262312c303fad88951a29f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017003Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Vitor Carvalho <vtrmc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753189}

chromecast/browser/general_audience_browsing_service.cc

@@ -104,7 +104,7 @@ GeneralAudienceBrowsingService::CreateSafeSearchURLChecker() {
   return std::make_unique<safe_search_api::URLChecker>(
       std::make_unique<safe_search_api::SafeSearchURLCheckerClient>(
           shared_url_loader_factory_, CreateNetworkTrafficAnnotationTag(),
-          std::string(), api_key_),
+          api_key_),
       /* cache size */ 1000);
 }
 

components/safe_search_api/safe_search/safe_search_url_checker_client.cc

@@ -32,15 +32,12 @@ namespace {
 const char kSafeSearchApiUrl[] =
     "https://safesearch.googleapis.com/v1:classify";
 const char kDataContentType[] = "application/x-www-form-urlencoded";
-const char kDataFormat[] = "key=%s&urls=%s&region_code=%s";
+const char kDataFormat[] = "key=%s&urls=%s";
 
 // Builds the POST data for SafeSearch API requests.
-std::string BuildRequestData(const std::string& api_key,
-                             const GURL& url,
-                             const std::string& region_code) {
+std::string BuildRequestData(const std::string& api_key, const GURL& url) {
   std::string query = net::EscapeQueryParamValue(url.spec(), true);
-  return base::StringPrintf(kDataFormat, api_key.c_str(), query.c_str(),
-                            region_code.c_str());
+  return base::StringPrintf(kDataFormat, api_key.c_str(), query.c_str());
 }
 
 // Parses a SafeSearch API |response| and stores the result in |is_porn|,
@@ -98,11 +95,9 @@ SafeSearchURLCheckerClient::Check::~Check() = default;
 SafeSearchURLCheckerClient::SafeSearchURLCheckerClient(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
     const net::NetworkTrafficAnnotationTag& traffic_annotation,
-    const std::string& country,
     const std::string& api_key)
     : url_loader_factory_(std::move(url_loader_factory)),
       traffic_annotation_(traffic_annotation),
-      country_(country),
       api_key_(api_key) {}
 
 SafeSearchURLCheckerClient::~SafeSearchURLCheckerClient() = default;
@@ -117,8 +112,8 @@ void SafeSearchURLCheckerClient::CheckURL(const GURL& url,
   std::unique_ptr<network::SimpleURLLoader> simple_url_loader =
       network::SimpleURLLoader::Create(std::move(resource_request),
                                        traffic_annotation_);
-  simple_url_loader->AttachStringForUpload(
-      BuildRequestData(api_key_, url, country_), kDataContentType);
+  simple_url_loader->AttachStringForUpload(BuildRequestData(api_key_, url),
+                                           kDataContentType);
   checks_in_progress_.push_front(std::make_unique<Check>(
       url, std::move(simple_url_loader), std::move(callback)));
   auto it = checks_in_progress_.begin();

components/safe_search_api/safe_search/safe_search_url_checker_client.h

@@ -26,12 +26,9 @@ namespace safe_search_api {
 // via a callback.
 class SafeSearchURLCheckerClient : public URLCheckerClient {
  public:
-  // |country| should be a two-letter country code (ISO 3166-1 alpha-2), e.g.,
-  // "us". Optional
   SafeSearchURLCheckerClient(
       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
       const net::NetworkTrafficAnnotationTag& traffic_annotation,
-      const std::string& country = std::string(),
       const std::string& api_key = google_apis::GetAPIKey());
 
   ~SafeSearchURLCheckerClient() override;
@@ -52,7 +49,6 @@ class SafeSearchURLCheckerClient : public URLCheckerClient {
 
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
   const net::NetworkTrafficAnnotationTag traffic_annotation_;
-  const std::string country_;
   const std::string api_key_;
 
   CheckList checks_in_progress_;