Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5159)

Unified Diff: chrome/test/data/webui/polymer_browser_test_base.js

Issue 1846383002: MD Downloads: fix vulcanize issues by excluding higher up in the dependency tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/md_downloads/vulcanize.py ('k') | ui/webui/resources/html/polymer.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/polymer_browser_test_base.js
diff --git a/chrome/test/data/webui/polymer_browser_test_base.js b/chrome/test/data/webui/polymer_browser_test_base.js
index bab6405dd7878eadc1873ab6d0d87a80073ef453..38cc5cdac4fe3b54ac97a0f76aef7ec3a0d7bc6b 100644
--- a/chrome/test/data/webui/polymer_browser_test_base.js
+++ b/chrome/test/data/webui/polymer_browser_test_base.js
@@ -90,12 +90,9 @@ PolymerTest.prototype = {
// Import Polymer and iron-test-helpers before running tests.
suiteSetup(function() {
- var promises = [];
- if (typeof Polymer != 'function') {
michaelpg 2016/04/05 00:49:42 maybe keep this as if (!Polymer) {
- promises.push(
- PolymerTest.importHtml(
- 'chrome://resources/polymer/v1_0/polymer/polymer.html'));
- }
+ var promises = [
+ PolymerTest.importHtml('chrome://resources/html/polymer.html'),
michaelpg 2016/04/05 00:49:42 this assumes the page being tested doesn't load
Dan Beam 2016/04/05 01:38:58 why doesn't media router stuff use polymer.html?
+ ];
if (typeof MockInteractions != 'object') {
// Avoid importing the HTML file because iron-test-helpers assumes it is
// not being imported separately alongside a vulcanized Polymer.
« no previous file with comments | « chrome/browser/resources/md_downloads/vulcanize.py ('k') | ui/webui/resources/html/polymer.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698