CountryNames: Separate data creation from usage

components/autofill/core/browser/personal_data_manager_unittest.cc

Index: components/autofill/core/browser/personal_data_manager_unittest.cc
diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index be26fdd6ad23181773c7b8a365c3d700ad6aeb62..d46eb5e657f101730574eb795b7b5a7266517fda 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -22,6 +22,7 @@
 #include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
+#include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
@@ -98,7 +99,9 @@ void ExpectSameElements(const std::vector<T*>& expectations,
 
 class PersonalDataManagerTest : public testing::Test {
  protected:
-  PersonalDataManagerTest() : autofill_table_(nullptr) {}
+  PersonalDataManagerTest() : autofill_table_(nullptr) {
+    CountryNames::SetLocaleString("en-US");

[Ilya Sherman, 2016/01/23 01:41:04]

Hmm, why is this needed, given that the PDM sets the locale internally?

[vabr (Chromium), 2016/01/25 10:36:44]

Good point, I forgot this here when I modified PDM, I guess.
Removed.

+  }
 
   void SetUp() override {
     prefs_ = test::PrefServiceForTesting();