WebUI: Allow rejecting a promise that is returned from cr.sendWithPromise().

chrome/test/data/webui/webui_resource_async_browsertest.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 async JS tests for cr.js utility methods.
  */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../';
@@ skipping 17 matching lines @@
   /** @override */
   isAsync: true,
 
   /** @override */
   runAccessibilityChecks: false,
 
   /** @override */
   extraLibraries: [
     ROOT_PATH + 'third_party/mocha/mocha.js',
     ROOT_PATH + 'chrome/test/data/webui/mocha_adapter.js',
-    ROOT_PATH + 'chrome/test/data/webui/promise_resolver.js',
     ROOT_PATH + 'ui/webui/resources/js/cr.js',
+    ROOT_PATH + 'ui/webui/resources/js/cr/promise_resolver.js',
   ],
 };
 
 TEST_F('WebUIResourceAsyncTest', 'SendWithPromise', function() {
   /**
    * TODO(dpapad): Move this helper method in test_api.js.
    * @param {string} name chrome.send message name.
    * @return {!Promise} Fires when chrome.send is called with the given message
    *     name.
    */
@@ skipping 97 matching lines @@
       return new Promise(function(resolve, reject) {
         listener1 = cr.addWebUIListener(EVENT_NAME, function() {
           assertEquals(0, arguments.length);
           resolve();
         });
         cr.webUIListenerCallback(EVENT_NAME);
       });
     });
 
     test('addWebUIListener_MulitpleListeners', function() {
-      var resolver1 = new PromiseResolver();
-      var resolver2 = new PromiseResolver();
+      var resolver1 = new cr.PromiseResolver();
+      var resolver2 = new cr.PromiseResolver();
       listener1 = cr.addWebUIListener(EVENT_NAME, resolver1.resolve);
       listener2 = cr.addWebUIListener(EVENT_NAME, resolver2.resolve);
       cr.webUIListenerCallback(EVENT_NAME);
       // Check that both listeners registered are invoked.
       return Promise.all([resolver1.promise, resolver2.promise]);
     });
   });
 
   // Run all registered tests.
   mocha.run();
 });