| Index: chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.js
|
| diff --git a/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.js b/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.js
|
| index f93743f117d6c25b390ad190132c6fa0aa9655e2..1101688b10253dcb712c27d2a5c48f6dcc5fd633 100644
|
| --- a/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.js
|
| +++ b/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.js
|
| @@ -7,9 +7,10 @@ cr.define('cr_toolbar_search_field', function() {
|
| function registerTests() {
|
| suite('cr-toolbar-search-field', function() {
|
| /** @type {?CrToolbarSearchFieldElement} */
|
| - var field;
|
| - /** @type {?MockSearchFieldDelegate} */
|
| - var delegate;
|
| + var field = null;
|
| +
|
| + /** @type {?Array<string>} */
|
| + var searches = null;
|
|
|
| /** @param {string} term */
|
| function simulateSearch(term) {
|
| @@ -17,22 +18,6 @@ cr.define('cr_toolbar_search_field', function() {
|
| field.onSearchTermSearch();
|
| }
|
|
|
| - /**
|
| - * @constructor
|
| - * @implements {SearchFieldDelegate}
|
| - */
|
| - function MockSearchFieldDelegate() {
|
| - /** @type {!Array<string>} */
|
| - this.searches = [];
|
| - }
|
| -
|
| - MockSearchFieldDelegate.prototype = {
|
| - /** @override */
|
| - onSearchTermSearch: function(term) {
|
| - this.searches.push(term);
|
| - }
|
| - };
|
| -
|
| suiteSetup(function() {
|
| return PolymerTest.importHtml(
|
| 'chrome://resources/cr_elements/cr_toolbar/' +
|
| @@ -41,17 +26,18 @@ cr.define('cr_toolbar_search_field', function() {
|
|
|
| setup(function() {
|
| PolymerTest.clearBody();
|
| - // Constructing a new delegate resets the list of searches.
|
| - delegate = new MockSearchFieldDelegate();
|
| field = document.createElement('cr-toolbar-search-field');
|
| - field.setDelegate(delegate);
|
| + searches = [];
|
| + field.addEventListener('search-changed', function(event) {
|
| + searches.push(event.detail);
|
| + });
|
| document.body.appendChild(field);
|
| });
|
|
|
| teardown(function() {
|
| field.remove();
|
| field = null;
|
| - delegate = null;
|
| + searches = null;
|
| });
|
|
|
| test('opens and closes correctly', function() {
|
| @@ -85,7 +71,7 @@ cr.define('cr_toolbar_search_field', function() {
|
| // Expecting identical query to be ignored.
|
| simulateSearch('query2');
|
|
|
| - assertEquals(['query1', '', 'query2'].join(), delegate.searches.join());
|
| + assertEquals(['query1', '', 'query2'].join(), searches.join());
|
| });
|
|
|
| test('blur does not close field when a search is active', function() {
|
|
|