| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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('#include "chrome/test/data/webui/history_ui_browsertest.h"'); | 5 GEN('#include "chrome/test/data/webui/history_ui_browsertest.h"'); |
| 6 | 6 |
| 7 /** @const */ var TOTAL_RESULT_COUNT = 160; | 7 /** @const */ var TOTAL_RESULT_COUNT = 160; |
| 8 /** @const */ var WAIT_TIMEOUT = 200; | 8 /** @const */ var WAIT_TIMEOUT = 200; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 setUp: function() { | 654 setUp: function() { |
| 655 // Show the filter controls as if the command line switch was active. | 655 // Show the filter controls as if the command line switch was active. |
| 656 $('top-container').hidden = true; | 656 $('top-container').hidden = true; |
| 657 $('history-page').classList.add('big-topbar-page'); | 657 $('history-page').classList.add('big-topbar-page'); |
| 658 $('filter-controls').hidden = false; | 658 $('filter-controls').hidden = false; |
| 659 expectFalse($('filter-controls').hidden); | 659 expectFalse($('filter-controls').hidden); |
| 660 }, | 660 }, |
| 661 }; | 661 }; |
| 662 | 662 |
| 663 /** | 663 /** |
| 664 * Disabled due to timeout on Mac http://crbug.com/377338 | 664 * Disabled due to timeout on Mac and ChromeOS http://crbug.com/377338 |
| 665 */ | 665 */ |
| 666 GEN('#if defined(OS_MACOSX)'); | 666 GEN('#if defined(OS_MACOSX) || defined(OS_CHROMEOS)'); |
| 667 GEN('#define MAYBE_allView DISABLED_allView'); | 667 GEN('#define MAYBE_allView DISABLED_allView'); |
| 668 GEN('#else'); | 668 GEN('#else'); |
| 669 GEN('#define MAYBE_allView allView'); | 669 GEN('#define MAYBE_allView allView'); |
| 670 GEN('#endif'); | 670 GEN('#endif'); |
| 671 TEST_F('RangeHistoryWebUITest', 'MAYBE_allView', function() { | 671 TEST_F('RangeHistoryWebUITest', 'MAYBE_allView', function() { |
| 672 // Check that we start off in the all time view. | 672 // Check that we start off in the all time view. |
| 673 expectTrue($('timeframe-filter-all').checked); | 673 expectTrue($('timeframe-filter-all').checked); |
| 674 // See if the correct number of days is shown. | 674 // See if the correct number of days is shown. |
| 675 var dayHeaders = document.querySelectorAll('.day'); | 675 var dayHeaders = document.querySelectorAll('.day'); |
| 676 assertEquals(Math.ceil(RESULTS_PER_PAGE / 4), dayHeaders.length); | 676 assertEquals(Math.ceil(RESULTS_PER_PAGE / 4), dayHeaders.length); |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 TEST_F('HistoryWebUIWithSchemesTest', 'groupingWithSchemes', function() { | 931 TEST_F('HistoryWebUIWithSchemesTest', 'groupingWithSchemes', function() { |
| 932 // Switch to the week view. | 932 // Switch to the week view. |
| 933 $('timeframe-filter-week').click(); | 933 $('timeframe-filter-week').click(); |
| 934 waitForCallback('historyResult', function() { | 934 waitForCallback('historyResult', function() { |
| 935 // Each URL should be organized under a different "domain". | 935 // Each URL should be organized under a different "domain". |
| 936 expectEquals(document.querySelectorAll('.entry').length, 4); | 936 expectEquals(document.querySelectorAll('.entry').length, 4); |
| 937 expectEquals(document.querySelectorAll('.site-domain-wrapper').length, 4); | 937 expectEquals(document.querySelectorAll('.site-domain-wrapper').length, 4); |
| 938 testDone(); | 938 testDone(); |
| 939 }); | 939 }); |
| 940 }); | 940 }); |
| OLD | NEW |