Polymer: Stop including test related components to production binary.

chrome/test/data/webui/polymer_browser_test_base.js

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 150a30b9a0714309c56389029ea94543c6411515..bbbac975dabcbe3e2b349b5dc60c6efb14f67bf1 100644
--- a/chrome/test/data/webui/polymer_browser_test_base.js
+++ b/chrome/test/data/webui/polymer_browser_test_base.js
@@ -40,6 +40,8 @@ PolymerTest.prototype = {
     '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 */
@@ -76,22 +78,11 @@ PolymerTest.prototype = {
       }
     };
 
-    // 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);
     });
   },