[ntp][modules] Set hl param to app locale for shopping tasks request

The hl param overrides the account language. By setting it to Chrome's
application locale we ensure that the shopping tasks module's and
Chrome's UI language will match.

Fixed: 1133409
Change-Id: I195734b8dbb46b35cd69b6e250f6d559f640aa5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2439022
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Auto-Submit: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811970}

chrome/browser/search/shopping_tasks/shopping_tasks_service.cc

@@ -6,6 +6,7 @@
 
 #include "chrome/common/webui_url_constants.h"
 #include "components/google/core/common/google_util.h"
+#include "net/base/url_util.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/simple_url_loader.h"
@@ -14,19 +15,23 @@ namespace {
 const char kNewTabShoppingTasksApiPath[] = "/async/newtab_shopping_tasks";
 const char kXSSIResponsePreamble[] = ")]}'";
 
-GURL GetApiUrl() {
+GURL GetApiUrl(const std::string& application_locale) {
   GURL google_base_url = google_util::CommandLineGoogleBaseURL();
   if (!google_base_url.is_valid()) {
     google_base_url = GURL(google_util::kGoogleHomepageURL);
   }
-  return google_base_url.Resolve(kNewTabShoppingTasksApiPath);
+  return net::AppendQueryParameter(
+      google_base_url.Resolve(kNewTabShoppingTasksApiPath), "hl",
+      application_locale);
 }
 }  // namespace
 
 ShoppingTasksService::ShoppingTasksService(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-    Profile* profile)
-    : url_loader_factory_(url_loader_factory) {}
+    Profile* profile,
+    const std::string& application_locale)
+    : url_loader_factory_(url_loader_factory),
+      application_locale_(application_locale) {}
 
 ShoppingTasksService::~ShoppingTasksService() = default;
 
@@ -70,7 +75,7 @@ void ShoppingTasksService::GetPrimaryShoppingTask(
         })");
 
   auto resource_request = std::make_unique<network::ResourceRequest>();
-  resource_request->url = GetApiUrl();
+  resource_request->url = GetApiUrl(application_locale_);
   resource_request->credentials_mode =
       network::mojom::CredentialsMode::kInclude;
   resource_request->request_initiator =

chrome/browser/search/shopping_tasks/shopping_tasks_service.h

@@ -26,7 +26,8 @@ class ShoppingTasksService : public KeyedService {
  public:
   ShoppingTasksService(
       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-      Profile* profile);
+      Profile* profile,
+      const std::string& application_locale);
   ShoppingTasksService(const ShoppingTasksService&) = delete;
   ~ShoppingTasksService() override;
 
@@ -50,6 +51,7 @@ class ShoppingTasksService : public KeyedService {
 
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
   std::list<std::unique_ptr<network::SimpleURLLoader>> loaders_;
+  std::string application_locale_;
 
   base::WeakPtrFactory<ShoppingTasksService> weak_ptr_factory_{this};
 };

chrome/browser/search/shopping_tasks/shopping_tasks_service_factory.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/search/shopping_tasks/shopping_tasks_service_factory.h"
 
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/shopping_tasks/shopping_tasks_service.h"
@@ -38,5 +39,6 @@ KeyedService* ShoppingTasksServiceFactory::BuildServiceInstanceFor(
       content::BrowserContext::GetDefaultStoragePartition(context)
           ->GetURLLoaderFactoryForBrowserProcess();
   return new ShoppingTasksService(url_loader_factory,
-                                  Profile::FromBrowserContext(context));
+                                  Profile::FromBrowserContext(context),
+                                  g_browser_process->GetApplicationLocale());
 }

chrome/browser/search/shopping_tasks/shopping_tasks_service_unittest.cc

@@ -28,7 +28,7 @@ class ShoppingTasksServiceTest : public testing::Test {
     service_ = std::make_unique<ShoppingTasksService>(
         base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
             &test_url_loader_factory_),
-        &profile_);
+        &profile_, "en-US");
   }
 
   void TearDown() override {
@@ -49,7 +49,7 @@ class ShoppingTasksServiceTest : public testing::Test {
 // Verifies correct parsing of well-formed JSON.
 TEST_F(ShoppingTasksServiceTest, GoodResponse) {
   test_url_loader_factory_.AddResponse(
-      "https://www.google.com/async/newtab_shopping_tasks",
+      "https://www.google.com/async/newtab_shopping_tasks?hl=en-US",
       R"()]}'
 {
   "update": {
@@ -123,7 +123,7 @@ TEST_F(ShoppingTasksServiceTest, GoodResponse) {
 // Verifies service can handle multiple in flight requests.
 TEST_F(ShoppingTasksServiceTest, MultiRequest) {
   test_url_loader_factory_.AddResponse(
-      "https://www.google.com/async/newtab_shopping_tasks",
+      "https://www.google.com/async/newtab_shopping_tasks?hl=en-US",
       R"()]}'
 {
   "update": {
@@ -179,7 +179,7 @@ TEST_F(ShoppingTasksServiceTest, MultiRequest) {
 // Verifies error if JSON is malformed.
 TEST_F(ShoppingTasksServiceTest, BadResponse) {
   test_url_loader_factory_.AddResponse(
-      "https://www.google.com/async/newtab_shopping_tasks",
+      "https://www.google.com/async/newtab_shopping_tasks?hl=en-US",
       ")]}'{\"update\":{\"promotions\":{}}}");
 
   shopping_tasks::mojom::ShoppingTaskPtr result;
@@ -200,7 +200,7 @@ TEST_F(ShoppingTasksServiceTest, BadResponse) {
 // Verifies error if no products.
 TEST_F(ShoppingTasksServiceTest, NoProducts) {
   test_url_loader_factory_.AddResponse(
-      "https://www.google.com/async/newtab_shopping_tasks",
+      "https://www.google.com/async/newtab_shopping_tasks?hl=en-US",
       R"()]}'
 {
   "update": {
@@ -237,7 +237,7 @@ TEST_F(ShoppingTasksServiceTest, NoProducts) {
 // Verifies error if download fails.
 TEST_F(ShoppingTasksServiceTest, ErrorResponse) {
   test_url_loader_factory_.AddResponse(
-      GURL("https://www.google.com/async/newtab_shopping_tasks"),
+      GURL("https://www.google.com/async/newtab_shopping_tasks?hl=en-US"),
       network::mojom::URLResponseHead::New(), std::string(),
       network::URLLoaderCompletionStatus(net::HTTP_NOT_FOUND));