| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 'use strict'; | 5 'use strict'; |
| 6 | 6 |
| 7 /** @suppress {duplicate} */ | 7 /** @suppress {duplicate} */ |
| 8 var base = base || {}; | 8 var base = base || {}; |
| 9 | 9 |
| 10 (function() { | 10 (function() { |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 return base.SpyPromise.settleAll(opt_timeoutMs).then(function() { | 285 return base.SpyPromise.settleAll(opt_timeoutMs).then(function() { |
| 286 base.SpyPromise.restore(); | 286 base.SpyPromise.restore(); |
| 287 return null; | 287 return null; |
| 288 }, function(error) { | 288 }, function(error) { |
| 289 base.SpyPromise.restore(); | 289 base.SpyPromise.restore(); |
| 290 throw error; | 290 throw error; |
| 291 }); | 291 }); |
| 292 } | 292 } |
| 293 }; | 293 }; |
| 294 })(); | 294 })(); |
| OLD | NEW |