| Index: chrome/test/data/webui/settings/search_page_test.js
|
| diff --git a/chrome/test/data/webui/settings/search_page_test.js b/chrome/test/data/webui/settings/search_page_test.js
|
| index c8efd1b5bfbacbfcdff5bbd685de958e46594169..a8394f176ab0acaa4af2b957793e19a7bcc54111 100644
|
| --- a/chrome/test/data/webui/settings/search_page_test.js
|
| +++ b/chrome/test/data/webui/settings/search_page_test.js
|
| @@ -109,11 +109,11 @@ cr.define('settings_search_page', function() {
|
| assertFalse(browserProxy.hotwordSearchEnabled);
|
| assertFalse(page.hotwordSearchEnablePref_.value);
|
|
|
| - var checkbox = page.$$('#hotwordSearchEnable');
|
| - assertTrue(!!checkbox);
|
| - assertFalse(checkbox.disabled);
|
| - assertFalse(checkbox.checked);
|
| - MockInteractions.tap(checkbox.$.checkbox);
|
| + var control = page.$$('#hotwordSearchEnable');
|
| + assertTrue(!!control);
|
| + assertFalse(control.disabled);
|
| + assertFalse(control.checked);
|
| + MockInteractions.tap(control.$.control);
|
| Polymer.dom.flush();
|
| return browserProxy.whenCalled('setHotwordSearchEnabled');
|
| }).then(function() {
|
| @@ -137,11 +137,11 @@ cr.define('settings_search_page', function() {
|
| assertFalse(page.hotwordInfo_.alwaysOn);
|
| assertFalse(page.hotwordInfo_.enabled);
|
|
|
| - var checkbox = page.$$('#hotwordSearchEnable');
|
| - assertTrue(!!checkbox);
|
| - assertFalse(checkbox.disabled);
|
| - assertFalse(checkbox.checked);
|
| - MockInteractions.tap(checkbox.$.checkbox);
|
| + var control = page.$$('#hotwordSearchEnable');
|
| + assertTrue(!!control);
|
| + assertFalse(control.disabled);
|
| + assertFalse(control.checked);
|
| + MockInteractions.tap(control.$.control);
|
| Polymer.dom.flush();
|
| return browserProxy.whenCalled('setHotwordSearchEnabled');
|
| }).then(function() {
|
| @@ -155,10 +155,10 @@ cr.define('settings_search_page', function() {
|
| Polymer.dom.flush();
|
| assertTrue(page.googleNowAvailable_);
|
|
|
| - var checkbox = page.$$('#googleNowEnable');
|
| - assertTrue(!!checkbox);
|
| - assertFalse(checkbox.disabled);
|
| - assertFalse(checkbox.checked);
|
| + var control = page.$$('#googleNowEnable');
|
| + assertTrue(!!control);
|
| + assertFalse(control.disabled);
|
| + assertFalse(control.checked);
|
|
|
| page.prefs = {
|
| google_now_launcher: {
|
| @@ -169,8 +169,8 @@ cr.define('settings_search_page', function() {
|
| }
|
| };
|
| Polymer.dom.flush();
|
| - assertFalse(checkbox.disabled);
|
| - assertTrue(checkbox.checked);
|
| + assertFalse(control.disabled);
|
| + assertTrue(control.checked);
|
| });
|
| });
|
| });
|
|
|