| Index: chrome/test/data/webui/settings/system_page_tests.js
|
| diff --git a/chrome/test/data/webui/settings/system_page_tests.js b/chrome/test/data/webui/settings/system_page_tests.js
|
| index 27ff9a50e51fc2a9ff8a0f55a852f43fc9a3b7a8..a9f2e219961abcc37e3373512f938c8bee38ebb9 100644
|
| --- a/chrome/test/data/webui/settings/system_page_tests.js
|
| +++ b/chrome/test/data/webui/settings/system_page_tests.js
|
| @@ -12,7 +12,7 @@ cr.define('settings_system_page', function() {
|
| * @implements {settings.SystemPageBrowserProxy}
|
| */
|
| function TestSystemPageBrowserProxy() {
|
| - settings.TestBrowserProxy.call(this, ['restartBrowser']);
|
| + settings.TestBrowserProxy.call(this, []);
|
| }
|
|
|
| TestSystemPageBrowserProxy.prototype = {
|
| @@ -22,26 +22,26 @@ cr.define('settings_system_page', function() {
|
| changeProxySettings: assertNotReached,
|
|
|
| /** @override */
|
| - restartBrowser: function() {
|
| - this.methodCalled('restartBrowser');
|
| - },
|
| -
|
| - /** @override */
|
| wasHardwareAccelerationEnabledAtStartup: function() {
|
| return HARDWARE_ACCELERATION_AT_STARTUP;
|
| },
|
| };
|
|
|
| suite('SettingsDevicePage', function() {
|
| - /** @type {settings.TestSystemPageBrowserProxy} */
|
| - var testBrowserProxy;
|
| + /** @type {TestSystemPageBrowserProxy} */
|
| + var systemBrowserProxy;
|
| +
|
| + /** @type {settings.TestLifetimeBrowserProxy} */
|
| + var lifetimeBrowserProxy;
|
|
|
| /** @type {SettingsSystemPageElement} */
|
| var systemPage;
|
|
|
| setup(function() {
|
| - testBrowserProxy = new TestSystemPageBrowserProxy;
|
| - settings.SystemPageBrowserProxyImpl.instance_ = testBrowserProxy;
|
| + lifetimeBrowserProxy = new settings.TestLifetimeBrowserProxy();
|
| + settings.LifetimeBrowserProxyImpl.instance_ = lifetimeBrowserProxy;
|
| + settings.SystemPageBrowserProxyImpl.instance_ =
|
| + new TestSystemPageBrowserProxy();
|
|
|
| systemPage = document.createElement('settings-system-page');
|
| systemPage.set('prefs', {
|
| @@ -81,7 +81,7 @@ cr.define('settings_system_page', function() {
|
| expectTrue(!!restart); // The "RESTART" button should be showing now.
|
|
|
| MockInteractions.tap(restart);
|
| - return testBrowserProxy.whenCalled('restartBrowser');
|
| + return lifetimeBrowserProxy.whenCalled('restart');
|
| });
|
| });
|
| });
|
|
|