| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 GEN('#if defined(OS_CHROMEOS)'); | 5 GEN('#if defined(OS_CHROMEOS)'); |
| 6 | 6 |
| 7 GEN_INCLUDE(['../options_browsertest_base.js']); | 7 GEN_INCLUDE(['../options_browsertest_base.js']); |
| 8 | 8 |
| 9 function BluetoothWebUITestAsync() {} | 9 function BluetoothWebUITestAsync() {} |
| 10 | 10 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 // The UI may not be updated until all callbacks have been handled, so | 116 // The UI may not be updated until all callbacks have been handled, so |
| 117 // send a new request that will get processed after any currently pending | 117 // send a new request that will get processed after any currently pending |
| 118 // callbacks. | 118 // callbacks. |
| 119 chrome.bluetooth.getAdapterState(function(state) { | 119 chrome.bluetooth.getAdapterState(function(state) { |
| 120 expectTrue(state.powered); | 120 expectTrue(state.powered); |
| 121 expectFalse($('bluetooth-paired-devices-list').parentNode.hidden); | 121 expectFalse($('bluetooth-paired-devices-list').parentNode.hidden); |
| 122 testDone(); | 122 testDone(); |
| 123 }.bind(this)); | 123 }.bind(this)); |
| 124 }); | 124 }); |
| 125 | 125 |
| 126 TEST_F('BluetoothWebUITestAsync', 'testAddDevice', function() { | 126 // TODO(crbug.com/603499) Test is flaky. |
| 127 TEST_F('BluetoothWebUITestAsync', 'DISABLED_testAddDevice', function() { |
| 127 assertEquals(this.browsePreload, document.location.href); | 128 assertEquals(this.browsePreload, document.location.href); |
| 128 | 129 |
| 129 // Enable bluetooth. | 130 // Enable bluetooth. |
| 130 $('enable-bluetooth').click(); | 131 $('enable-bluetooth').click(); |
| 131 | 132 |
| 132 // Wait for the UI to process any pending messages. | 133 // Wait for the UI to process any pending messages. |
| 133 window.setTimeout(function() { | 134 window.setTimeout(function() { |
| 134 // Wait for fake bluetooth impl to send any updates. | 135 // Wait for fake bluetooth impl to send any updates. |
| 135 chrome.bluetooth.getAdapterState(function(state) { | 136 chrome.bluetooth.getAdapterState(function(state) { |
| 136 var pairedDeviceList = $('bluetooth-paired-devices-list'); | 137 var pairedDeviceList = $('bluetooth-paired-devices-list'); |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 assertEquals(pairDeviceDialogSize, nodeCount(pairDeviceDialog)); | 429 assertEquals(pairDeviceDialogSize, nodeCount(pairDeviceDialog)); |
| 429 } | 430 } |
| 430 | 431 |
| 431 testDone(); | 432 testDone(); |
| 432 }.bind(this)); | 433 }.bind(this)); |
| 433 }.bind(this)); | 434 }.bind(this)); |
| 434 }.bind(this)); | 435 }.bind(this)); |
| 435 }); | 436 }); |
| 436 | 437 |
| 437 GEN('#endif'); | 438 GEN('#endif'); |
| OLD | NEW |