| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 /** | 5 /** |
| 6 * Test fixture for generated tests. | 6 * Test fixture for generated tests. |
| 7 * @extends {testing.Test} | 7 * @extends {testing.Test} |
| 8 */ | 8 */ |
| 9 function CertificateViewerUITest() {}; | 9 function CertificateViewerUITest() {}; |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 CertificateViewerUITestAsync.prototype = { | 36 CertificateViewerUITestAsync.prototype = { |
| 37 __proto__: CertificateViewerUITest.prototype, | 37 __proto__: CertificateViewerUITest.prototype, |
| 38 | 38 |
| 39 /** @inheritDoc */ | 39 /** @inheritDoc */ |
| 40 isAsync: true, | 40 isAsync: true, |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 // Include the bulk of c++ code. | 43 // Include the bulk of c++ code. |
| 44 // Certificate viewer UI tests are disabled on platforms with native certificate | 44 // Certificate viewer UI tests are disabled on platforms with native certificate |
| 45 // viewers. | 45 // viewers. |
| 46 // They fails on aura/linux, aura/chromeos. See crbug.com/105952. | |
| 47 GEN('#include "chrome/test/data/webui/certificate_viewer_ui_test-inl.h"'); | 46 GEN('#include "chrome/test/data/webui/certificate_viewer_ui_test-inl.h"'); |
| 48 GEN('') | 47 GEN('') |
| 49 GEN('#if !defined(OS_POSIX) || defined(OS_MACOSX) || defined(USE_AURA)') | 48 GEN('#if !defined(OS_POSIX) || defined(OS_MACOSX)') |
| 50 GEN('#define MAYBE_testDialogURL DISABLED_testDialogURL') | 49 GEN('#define MAYBE_testDialogURL DISABLED_testDialogURL') |
| 51 GEN('#define MAYBE_testCN DISABLED_testCN') | 50 GEN('#define MAYBE_testCN DISABLED_testCN') |
| 52 GEN('#define MAYBE_testDetails DISABLED_testDetails') | 51 GEN('#define MAYBE_testDetails DISABLED_testDetails') |
| 53 GEN('#else') | 52 GEN('#else') |
| 54 GEN('#define MAYBE_testDialogURL testDialogURL') | 53 GEN('#define MAYBE_testDialogURL testDialogURL') |
| 55 GEN('#define MAYBE_testCN testCN') | 54 GEN('#define MAYBE_testCN testCN') |
| 56 GEN('#define MAYBE_testDetails testDetails') | 55 GEN('#define MAYBE_testDetails testDetails') |
| 57 GEN('#endif') | 56 GEN('#endif') |
| 58 GEN(''); | 57 GEN(''); |
| 59 | 58 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 function getElementWithValue(tree) { | 121 function getElementWithValue(tree) { |
| 123 for (var i = 0; i < tree.childNodes.length; i++) { | 122 for (var i = 0; i < tree.childNodes.length; i++) { |
| 124 var element = tree.childNodes[i]; | 123 var element = tree.childNodes[i]; |
| 125 if (element.detail && element.detail.payload && element.detail.payload.val) | 124 if (element.detail && element.detail.payload && element.detail.payload.val) |
| 126 return element; | 125 return element; |
| 127 if (element = getElementWithValue(element)) | 126 if (element = getElementWithValue(element)) |
| 128 return element; | 127 return element; |
| 129 } | 128 } |
| 130 return null; | 129 return null; |
| 131 } | 130 } |
| OLD | NEW |