CountryNames: Separate data creation from usage

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

Index: chrome/browser/sync/profile_sync_service_autofill_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index 706d28c7ba7268c9e1a1f4eb3cfc2d2f019a3dce..ccd554d8b0308de654af61501efe25af454a5ea6 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -39,6 +39,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
+#include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service.h"
 #include "components/autofill/core/browser/webdata/autofill_change.h"
@@ -429,7 +430,9 @@ class ProfileSyncServiceAutofillTest
   ProfileSyncServiceAutofillTest()
       : profile_manager_(TestingBrowserProcess::GetGlobal()),
         debug_ptr_factory_(this) {
+    autofill::CountryNames::SetLocaleString("en-US");
   }
+
   ~ProfileSyncServiceAutofillTest() override {}
 
   void SetUp() override {
@@ -607,7 +610,7 @@ class ProfileSyncServiceAutofillTest
         AutofillProfile p;
         p.set_guid(autofill.profile().guid());
         AutofillProfileSyncableService::OverwriteProfileWithServerData(
-            autofill.profile(), &p, "en-US");
+            autofill.profile(), &p);
         profiles->push_back(p);
       }
       child_id = child_node.GetSuccessorId();
@@ -633,8 +636,8 @@ class ProfileSyncServiceAutofillTest
           child_node.GetEntitySpecifics().autofill_profile());
         AutofillProfile p;
         p.set_guid(autofill.guid());
-        AutofillProfileSyncableService::OverwriteProfileWithServerData(
-            autofill, &p, "en-US");
+        AutofillProfileSyncableService::OverwriteProfileWithServerData(autofill,
+                                                                       &p);
         profiles->push_back(p);
       child_id = child_node.GetSuccessorId();
     }