Polymer: Stop including test related components to production binary.

chrome/test/data/webui/polymer_browser_test_base.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview Framework for running JavaScript tests of Polymer elements.
  */
 
 /**
  * Test fixture for Polymer element testing.
@@ skipping 22 matching lines @@
   /**
    * Files that need not be compiled. Should be overridden to use correct
    * relative paths with PolymerTest.getLibraries.
    * @override
    */
   extraLibraries: [
     'ui/webui/resources/js/cr.js',
     'ui/webui/resources/js/promise_resolver.js',
     'third_party/mocha/mocha.js',
     'chrome/test/data/webui/mocha_adapter.js',
+    'third_party/polymer/v1_0/components-chromium/iron-test-helpers/' +
+        'mock-interactions.js',
   ],
 
   /** @override */
   setUp: function() {
     testing.Test.prototype.setUp.call(this);
 
     // List of imported URLs for debugging purposes.
     PolymerTest.importUrls_ = [];
     PolymerTest.scriptUrls_ = [];
 
@@ skipping 16 matching lines @@
           msg += '  ' + PolymerTest.importUrls_[i] + '\n';
         for (var i = 0; i < PolymerTest.scriptUrls_.length; i++)
           msg += '  ' + PolymerTest.scriptUrls_[i] + '\n';
         console.error(msg);
 
         // Mocha will handle the error.
         throw e;
       }
     };
 
-    // Import Polymer and iron-test-helpers before running tests.
+    // Import Polymer before running tests.
     suiteSetup(function() {
-      var promises = [];
       if (!window.Polymer) {
-        promises.push(
-            PolymerTest.importHtml('chrome://resources/html/polymer.html'));
+        return PolymerTest.importHtml('chrome://resources/html/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.
-        promises.push(
-            PolymerTest.loadScript(
-                'chrome://resources/polymer/v1_0/iron-test-helpers/' +
-                'mock-interactions.js'));
-      }
-      return Promise.all(promises);
     });
   },
 
   /** @override */
   tearDown: function() {
     // Note: We do this in tearDown() so that we have a chance to stamp all the
     // dom-if templates, add elements through interaction, etc.
     PolymerTest.testIronIcons(document.body);
 
     testing.Test.prototype.tearDown.call(this);
@@ skipping 86 matching lines @@
  * https://github.com/Polymer/web-component-tester/blob/master/browser/environment/helpers.js#L97
  */
 PolymerTest.flushTasks = function() {
   Polymer.dom.flush();
   // Promises have microtask timing, so we use setTimeout to explicity force a
   // new task.
   return new Promise(function(resolve, reject) {
     window.setTimeout(resolve, 0);
   });
 };