Index: chrome/test/data/webui/settings/settings_autofill_section_browsertest.js |
diff --git a/chrome/test/data/webui/settings/settings_autofill_section_browsertest.js b/chrome/test/data/webui/settings/settings_autofill_section_browsertest.js |
index 30e8e862acf8b882ec873e7bf65fc4ed039827d8..47bb0bb5491d8f7a5cbd1d9d4aa8b746fdb69d60 100644 |
--- a/chrome/test/data/webui/settings/settings_autofill_section_browsertest.js |
+++ b/chrome/test/data/webui/settings/settings_autofill_section_browsertest.js |
@@ -99,6 +99,7 @@ SettingsAutofillSectionBrowserTest.prototype = { |
extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
'passwords_and_autofill_fake_data.js', |
'test_util.js', |
+ 'ensure_lazy_loaded.js', |
]), |
/** |
@@ -115,8 +116,7 @@ SettingsAutofillSectionBrowserTest.prototype = { |
// Test is run on an individual element that won't have a page language. |
this.accessibilityAuditConfig.auditRulesToIgnore.push('humanLangMissing'); |
- settings.address.CountryDetailManagerImpl.instance_ = |
- new CountryDetailManagerTestImpl(); |
+ settings.ensureLazyLoaded(); |
}, |
/** |
@@ -173,11 +173,16 @@ SettingsAutofillSectionBrowserTest.prototype = { |
TEST_F('SettingsAutofillSectionBrowserTest', 'CreditCardTests', function() { |
var self = this; |
- setup(function() { |
- PolymerTest.clearBody(); |
- }); |
- |
suite('AutofillSection', function() { |
+ suiteSetup(function() { |
+ settings.address.CountryDetailManagerImpl.instance_ = |
+ new CountryDetailManagerTestImpl(); |
+ }); |
+ |
+ setup(function() { |
+ PolymerTest.clearBody(); |
+ }); |
+ |
test('verifyCreditCardCount', function() { |
var section = self.createAutofillSection_([], []); |
assertTrue(!!section); |
@@ -417,11 +422,17 @@ TEST_F('SettingsAutofillSectionBrowserTest', 'CreditCardTests', function() { |
TEST_F('SettingsAutofillSectionBrowserTest', 'AddressTests', function() { |
var self = this; |
- setup(function() { |
- PolymerTest.clearBody(); |
- }); |
suite('AutofillSection', function() { |
+ suiteSetup(function() { |
+ settings.address.CountryDetailManagerImpl.instance_ = |
+ new CountryDetailManagerTestImpl(); |
+ }); |
+ |
+ setup(function() { |
+ PolymerTest.clearBody(); |
+ }); |
+ |
test('verifyNoAddresses', function() { |
var section = self.createAutofillSection_([], []); |
assertTrue(!!section); |
@@ -691,11 +702,16 @@ TEST_F('SettingsAutofillSectionBrowserTest', 'AddressTests', function() { |
TEST_F('SettingsAutofillSectionBrowserTest', 'AddressLocaleTests', function() { |
var self = this; |
- setup(function() { |
- PolymerTest.clearBody(); |
- }); |
- |
suite('AutofillSection', function() { |
+ suiteSetup(function() { |
+ settings.address.CountryDetailManagerImpl.instance_ = |
+ new CountryDetailManagerTestImpl(); |
+ }); |
+ |
+ setup(function() { |
+ PolymerTest.clearBody(); |
+ }); |
+ |
// US address has 3 fields on the same line. |
test('verifyEditingUSAddress', function() { |
var address = FakeDataMaker.emptyAddressEntry(); |