| Index: chrome/test/data/webui/settings/settings_page_browsertest.js
|
| diff --git a/chrome/test/data/webui/settings/settings_page_browsertest.js b/chrome/test/data/webui/settings/settings_page_browsertest.js
|
| index 52b1fb3f5c9259b22f85c19866979962a3cad4f3..e666d830e49d977af9bb5bc8ef4d8fcdc660d1c6 100644
|
| --- a/chrome/test/data/webui/settings/settings_page_browsertest.js
|
| +++ b/chrome/test/data/webui/settings/settings_page_browsertest.js
|
| @@ -32,12 +32,21 @@ SettingsPageBrowserTest.prototype = {
|
| /** @override */
|
| runAccessibilityChecks: false,
|
|
|
| + /** @type {?SettingsBasicPageElement} */
|
| + basicPage: null,
|
| +
|
| /** @override */
|
| setUp: function() {
|
| PolymerTest.prototype.setUp.call(this);
|
| suiteSetup(function() {
|
| return CrSettingsPrefs.initialized;
|
| });
|
| +
|
| + suiteSetup(function() {
|
| + return this.getPage('basic').then(function(basicPage) {
|
| + this.basicPage = basicPage;
|
| + }.bind(this));
|
| + }.bind(this));
|
| },
|
|
|
| /**
|
| @@ -61,13 +70,15 @@ SettingsPageBrowserTest.prototype = {
|
| assertTrue(!!settingsMain);
|
| var pageType = 'settings-' + type + '-page';
|
| var page = settingsMain.$$(pageType);
|
| - assertTrue(!!page);
|
| - var idleRender = page.$$('template[is=settings-idle-render]');
|
| - if (idleRender) {
|
| - idleRender.get();
|
| +
|
| + var idleRender = page && page.$$('template[is=settings-idle-load]');
|
| + if (!idleRender)
|
| + return Promise.resolve(page);
|
| +
|
| + return idleRender.get().then(function() {
|
| Polymer.dom.flush();
|
| - }
|
| - return page;
|
| + return page;
|
| + });
|
| },
|
|
|
| /**
|
|
|