CountryNames: Separate data creation from usage

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 21 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
+#include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 254 matching lines @@
   MockNewCreditCardBubbleController* mock_new_card_bubble_controller_;
 
   // The number of times that the submit button was delayed.
   int submit_button_delay_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
 class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
  protected:
-  AutofillDialogControllerTest(): form_structure_(NULL) {}
+  AutofillDialogControllerTest() : form_structure_(NULL) {
+    CountryNames::SetLocaleString("en-US");
+  }
 
   // testing::Test implementation:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     Reset();
   }
 
   void TearDown() override {
     if (controller_)
       controller_->ViewClosed();
@@ skipping 1504 matching lines @@
       SECTION_SHIPPING,
       NAME_FULL,
       gfx::NativeView(),
       gfx::Rect(),
       profile.GetRawInfo(NAME_FULL).substr(0, 1),
       true);
   EXPECT_EQ(NAME_FULL, controller()->popup_input_type());
 }
 
 }  // namespace autofill