| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1458 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), | 1458 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), |
| 1459 web_contents()[i]->GetLastActiveTime()); | 1459 web_contents()[i]->GetLastActiveTime()); |
| 1460 } | 1460 } |
| 1461 } | 1461 } |
| 1462 | 1462 |
| 1463 // Activate the 2nd tab before the browser closes. This should be persisted in | 1463 // Activate the 2nd tab before the browser closes. This should be persisted in |
| 1464 // the following test. | 1464 // the following test. |
| 1465 new_browser->tab_strip_model()->ActivateTabAt(1, true); | 1465 new_browser->tab_strip_model()->ActivateTabAt(1, true); |
| 1466 } | 1466 } |
| 1467 | 1467 |
| 1468 // PRE_CorrectLoadingOrder is flaky on ChromeOS MSAN. https://crbug.com/582323. | 1468 // PRE_CorrectLoadingOrder is flaky on ChromeOS MSAN: https://crbug.com/582323 |
| 1469 #if defined (OS_CHROMEOS) && defined(MEMORY_SANITIZER) | 1469 // And Mac: https://crbug.com/656687 |
| 1470 #if (defined(OS_CHROMEOS) && defined(MEMORY_SANITIZER)) || defined(OS_MACOSX) |
| 1470 #define MAYBE_CorrectLoadingOrder DISABLED_CorrectLoadingOrder | 1471 #define MAYBE_CorrectLoadingOrder DISABLED_CorrectLoadingOrder |
| 1471 #else | 1472 #else |
| 1472 #define MAYBE_CorrectLoadingOrder CorrectLoadingOrder | 1473 #define MAYBE_CorrectLoadingOrder CorrectLoadingOrder |
| 1473 #endif | 1474 #endif |
| 1474 IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, MAYBE_CorrectLoadingOrder) { | 1475 IN_PROC_BROWSER_TEST_F(SmartSessionRestoreTest, MAYBE_CorrectLoadingOrder) { |
| 1475 const int activation_order[] = {4, 2, 5, 0, 3, 1}; | 1476 const int activation_order[] = {4, 2, 5, 0, 3, 1}; |
| 1476 Profile* profile = browser()->profile(); | 1477 Profile* profile = browser()->profile(); |
| 1477 | 1478 |
| 1478 // Close the browser that gets opened automatically so we can track the order | 1479 // Close the browser that gets opened automatically so we can track the order |
| 1479 // of loading of the tabs. | 1480 // of loading of the tabs. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 1502 // automatically at the start of the test. | 1503 // automatically at the start of the test. |
| 1503 for (size_t i = 1; i < web_contents().size(); i++) { | 1504 for (size_t i = 1; i < web_contents().size(); i++) { |
| 1504 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); | 1505 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); |
| 1505 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); | 1506 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); |
| 1506 if (i > 0) { | 1507 if (i > 0) { |
| 1507 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), | 1508 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), |
| 1508 web_contents()[i]->GetLastActiveTime()); | 1509 web_contents()[i]->GetLastActiveTime()); |
| 1509 } | 1510 } |
| 1510 } | 1511 } |
| 1511 } | 1512 } |
| OLD | NEW |