Commit d993020f authored by dpapad's avatar dpapad Committed by Commit Bot

MD Extensions: Stop loading HTML files dynamically during testing.

It is unnecessary since all tests did load chrome://extensions as
|browsePreload| anyway, but most importantly this causes the extensions
page to load twice during optimized builds, which leads to runtime errors.

This is in preparation of turning on optimize_webui for MD Extensions.

Bug: 764126
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I5e8b903bd4b5589af26fea6b3a25290d56188a7a
Reviewed-on: https://chromium-review.googlesource.com/703861
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506964}
parent 66ac041a
......@@ -10,6 +10,7 @@
<link rel="import" href="chrome://resources/html/action_link_css.html">
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/load_time_data.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
......
......@@ -158,6 +158,11 @@ TEST_F('CrExtensionsItemsTest', 'RemoveButton', function() {
// Extension Detail View Tests
var CrExtensionsDetailViewTest = class extends CrExtensionsBrowserTest {
/** @override */
get browsePreload() {
return 'chrome://extensions/detail_view.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
......@@ -189,6 +194,11 @@ TEST_F(
// Extension Item List Tests
var CrExtensionsItemListTest = class extends CrExtensionsBrowserTest {
/** @override */
get browsePreload() {
return 'chrome://extensions/item_list.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
......@@ -460,6 +470,11 @@ TEST_F('CrExtensionsErrorPageTest', 'ErrorSelection', function() {
// Extension Code Section Tests
var CrExtensionsCodeSectionTest = class extends CrExtensionsBrowserTest {
/** @override */
get browsePreload() {
return 'chrome://extensions/code_section.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
......
......@@ -23,10 +23,6 @@ cr.define('extension_code_section_tests', function() {
var couldNotDisplayCode = 'No code here';
suiteSetup(function() {
return PolymerTest.importHtml('chrome://extensions/code_section.html');
});
// Initialize an extension item before each test.
setup(function() {
PolymerTest.clearBody();
......
......@@ -27,13 +27,16 @@ cr.define('extension_detail_view_tests', function() {
/** @type {extension_test_util.MockItemDelegate} */
var mockDelegate;
suiteSetup(function() {
return PolymerTest.importHtml('chrome://extensions/item.html');
});
// Initialize an extension item before each test.
setup(function() {
PolymerTest.clearBody();
loadTimeData.data = {
itemDependentEntry: '',
itemOff: '',
itemOn: '',
itemSourcePolicy: '',
itemSourceWebstore: '',
};
extensionData = extension_test_util.createExtensionInfo({
incognitoAccess: {isEnabled: true, isActive: false},
fileAccess: {isEnabled: true, isActive: false},
......
......@@ -58,10 +58,6 @@ cr.define('extension_error_page_tests', function() {
fromIncognito: false,
};
suiteSetup(function() {
return PolymerTest.importHtml('chrome://extensions/error_page.html');
});
// Initialize an extension item before each test.
setup(function() {
PolymerTest.clearBody();
......
......@@ -16,10 +16,6 @@ cr.define('extension_item_list_tests', function() {
var itemList;
var testVisible;
suiteSetup(function() {
return PolymerTest.importHtml('chrome://extensions/item-list.html');
});
// Initialize an extension item before each test.
setup(function() {
PolymerTest.clearBody();
......
......@@ -89,10 +89,6 @@ cr.define('extension_service_tests', function() {
return manager.extensions.find(elMatches) || manager.apps.find(elMatches);
};
suiteSetup(function() {
return PolymerTest.importHtml('chrome://extensions/service.html');
});
// Initialize an extension item before each test.
setup(function() {
service = extensions.Service.getInstance();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment