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 #include <algorithm> | 5 #include <algorithm> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 | 607 |
608 // This should have created a new browser window. | 608 // This should have created a new browser window. |
609 Browser* new_browser = FindOneOtherBrowser(browser()); | 609 Browser* new_browser = FindOneOtherBrowser(browser()); |
610 ASSERT_TRUE(new_browser); | 610 ASSERT_TRUE(new_browser); |
611 | 611 |
612 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 612 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
613 | 613 |
614 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { | 614 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { |
615 // The browser should show only the promo. | 615 // The browser should show only the promo. |
616 ASSERT_EQ(1, tab_strip->count()); | 616 ASSERT_EQ(1, tab_strip->count()); |
617 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 617 EXPECT_EQ(signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 618 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, |
| 619 false), |
618 tab_strip->GetWebContentsAt(0)->GetURL()); | 620 tab_strip->GetWebContentsAt(0)->GetURL()); |
619 } else if (IsWindows10OrNewer()) { | 621 } else if (IsWindows10OrNewer()) { |
620 // The browser should show the welcome page and the NTP. | 622 // The browser should show the welcome page and the NTP. |
621 ASSERT_EQ(2, tab_strip->count()); | 623 ASSERT_EQ(2, tab_strip->count()); |
622 EXPECT_EQ(GURL(internals::GetWelcomePageURL()), | 624 EXPECT_EQ(GURL(internals::GetWelcomePageURL()), |
623 tab_strip->GetWebContentsAt(0)->GetURL()); | 625 tab_strip->GetWebContentsAt(0)->GetURL()); |
624 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), | 626 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), |
625 tab_strip->GetWebContentsAt(1)->GetURL()); | 627 tab_strip->GetWebContentsAt(1)->GetURL()); |
626 } else { | 628 } else { |
627 // The browser should show only the NTP. | 629 // The browser should show only the NTP. |
(...skipping 20 matching lines...) Expand all Loading... |
648 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 650 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
649 EXPECT_EQ(2, tab_strip->count()); | 651 EXPECT_EQ(2, tab_strip->count()); |
650 | 652 |
651 if (IsWindows10OrNewer()) { | 653 if (IsWindows10OrNewer()) { |
652 EXPECT_EQ(internals::GetWelcomePageURL(), | 654 EXPECT_EQ(internals::GetWelcomePageURL(), |
653 tab_strip->GetWebContentsAt(0)->GetURL()); | 655 tab_strip->GetWebContentsAt(0)->GetURL()); |
654 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), | 656 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), |
655 tab_strip->GetWebContentsAt(1)->GetURL()); | 657 tab_strip->GetWebContentsAt(1)->GetURL()); |
656 } else { | 658 } else { |
657 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { | 659 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { |
658 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 660 EXPECT_EQ(signin::GetPromoURL( |
| 661 signin_metrics::ACCESS_POINT_START_PAGE, |
| 662 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false), |
659 tab_strip->GetWebContentsAt(0)->GetURL()); | 663 tab_strip->GetWebContentsAt(0)->GetURL()); |
660 } else { | 664 } else { |
661 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), | 665 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), |
662 tab_strip->GetWebContentsAt(0)->GetURL()); | 666 tab_strip->GetWebContentsAt(0)->GetURL()); |
663 } | 667 } |
664 EXPECT_EQ(internals::GetWelcomePageURL(), | 668 EXPECT_EQ(internals::GetWelcomePageURL(), |
665 tab_strip->GetWebContentsAt(1)->GetURL()); | 669 tab_strip->GetWebContentsAt(1)->GetURL()); |
666 } | 670 } |
667 } | 671 } |
668 | 672 |
(...skipping 15 matching lines...) Expand all Loading... |
684 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false, | 688 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false, |
685 browser()->host_desktop_type())); | 689 browser()->host_desktop_type())); |
686 | 690 |
687 // This should have created a new browser window. | 691 // This should have created a new browser window. |
688 Browser* new_browser = FindOneOtherBrowser(browser()); | 692 Browser* new_browser = FindOneOtherBrowser(browser()); |
689 ASSERT_TRUE(new_browser); | 693 ASSERT_TRUE(new_browser); |
690 | 694 |
691 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 695 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
692 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { | 696 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { |
693 EXPECT_EQ(2, tab_strip->count()); | 697 EXPECT_EQ(2, tab_strip->count()); |
694 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 698 EXPECT_EQ(signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 699 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, |
| 700 false), |
695 tab_strip->GetWebContentsAt(0)->GetURL()); | 701 tab_strip->GetWebContentsAt(0)->GetURL()); |
696 EXPECT_EQ("title1.html", | 702 EXPECT_EQ("title1.html", |
697 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); | 703 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); |
698 } else { | 704 } else { |
699 EXPECT_EQ(1, tab_strip->count()); | 705 EXPECT_EQ(1, tab_strip->count()); |
700 EXPECT_EQ("title1.html", | 706 EXPECT_EQ("title1.html", |
701 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); | 707 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); |
702 } | 708 } |
703 } | 709 } |
704 | 710 |
(...skipping 14 matching lines...) Expand all Loading... |
719 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false, | 725 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false, |
720 browser()->host_desktop_type())); | 726 browser()->host_desktop_type())); |
721 | 727 |
722 // This should have created a new browser window. | 728 // This should have created a new browser window. |
723 Browser* new_browser = FindOneOtherBrowser(browser()); | 729 Browser* new_browser = FindOneOtherBrowser(browser()); |
724 ASSERT_TRUE(new_browser); | 730 ASSERT_TRUE(new_browser); |
725 | 731 |
726 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 732 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
727 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { | 733 if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) { |
728 EXPECT_EQ(3, tab_strip->count()); | 734 EXPECT_EQ(3, tab_strip->count()); |
729 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 735 EXPECT_EQ(signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 736 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, |
| 737 false), |
730 tab_strip->GetWebContentsAt(0)->GetURL()); | 738 tab_strip->GetWebContentsAt(0)->GetURL()); |
731 EXPECT_EQ("title1.html", | 739 EXPECT_EQ("title1.html", |
732 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); | 740 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); |
733 EXPECT_EQ(internals::GetWelcomePageURL(), | 741 EXPECT_EQ(internals::GetWelcomePageURL(), |
734 tab_strip->GetWebContentsAt(2)->GetURL()); | 742 tab_strip->GetWebContentsAt(2)->GetURL()); |
735 } else { | 743 } else { |
736 EXPECT_EQ(2, tab_strip->count()); | 744 EXPECT_EQ(2, tab_strip->count()); |
737 EXPECT_EQ("title1.html", | 745 EXPECT_EQ("title1.html", |
738 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); | 746 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); |
739 EXPECT_EQ(internals::GetWelcomePageURL(), | 747 EXPECT_EQ(internals::GetWelcomePageURL(), |
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1400 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true, | 1408 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true, |
1401 browser()->host_desktop_type())); | 1409 browser()->host_desktop_type())); |
1402 | 1410 |
1403 // This should have created a new browser window. | 1411 // This should have created a new browser window. |
1404 Browser* new_browser = FindOneOtherBrowser(browser()); | 1412 Browser* new_browser = FindOneOtherBrowser(browser()); |
1405 ASSERT_TRUE(new_browser); | 1413 ASSERT_TRUE(new_browser); |
1406 | 1414 |
1407 // Verify that the sync promo and the welcome page are shown. | 1415 // Verify that the sync promo and the welcome page are shown. |
1408 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 1416 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
1409 ASSERT_EQ(2, tab_strip->count()); | 1417 ASSERT_EQ(2, tab_strip->count()); |
1410 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 1418 EXPECT_EQ( |
1411 tab_strip->GetWebContentsAt(0)->GetURL()); | 1419 signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 1420 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false), |
| 1421 tab_strip->GetWebContentsAt(0)->GetURL()); |
1412 EXPECT_EQ(internals::GetWelcomePageURL(), | 1422 EXPECT_EQ(internals::GetWelcomePageURL(), |
1413 tab_strip->GetWebContentsAt(1)->GetURL()); | 1423 tab_strip->GetWebContentsAt(1)->GetURL()); |
1414 } | 1424 } |
1415 | 1425 |
1416 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) | 1426 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) |
1417 // http://crbug.com/314819 | 1427 // http://crbug.com/314819 |
1418 #define MAYBE_FirstRunTabsPromoAllowed DISABLED_FirstRunTabsPromoAllowed | 1428 #define MAYBE_FirstRunTabsPromoAllowed DISABLED_FirstRunTabsPromoAllowed |
1419 #else | 1429 #else |
1420 #define MAYBE_FirstRunTabsPromoAllowed FirstRunTabsPromoAllowed | 1430 #define MAYBE_FirstRunTabsPromoAllowed FirstRunTabsPromoAllowed |
1421 #endif | 1431 #endif |
(...skipping 24 matching lines...) Expand all Loading... |
1446 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true, | 1456 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true, |
1447 browser()->host_desktop_type())); | 1457 browser()->host_desktop_type())); |
1448 | 1458 |
1449 // This should have created a new browser window. | 1459 // This should have created a new browser window. |
1450 Browser* new_browser = FindOneOtherBrowser(browser()); | 1460 Browser* new_browser = FindOneOtherBrowser(browser()); |
1451 ASSERT_TRUE(new_browser); | 1461 ASSERT_TRUE(new_browser); |
1452 | 1462 |
1453 // Verify that the first-run tab is shown and the sync promo has been added. | 1463 // Verify that the first-run tab is shown and the sync promo has been added. |
1454 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 1464 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
1455 ASSERT_EQ(2, tab_strip->count()); | 1465 ASSERT_EQ(2, tab_strip->count()); |
1456 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 1466 EXPECT_EQ( |
1457 tab_strip->GetWebContentsAt(0)->GetURL()); | 1467 signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 1468 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false), |
| 1469 tab_strip->GetWebContentsAt(0)->GetURL()); |
1458 EXPECT_EQ("title1.html", | 1470 EXPECT_EQ("title1.html", |
1459 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); | 1471 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); |
1460 } | 1472 } |
1461 | 1473 |
1462 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) | 1474 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) |
1463 // http://crbug.com/314819 | 1475 // http://crbug.com/314819 |
1464 #define MAYBE_FirstRunTabsContainSyncPromo \ | 1476 #define MAYBE_FirstRunTabsContainSyncPromo \ |
1465 DISABLED_FirstRunTabsContainSyncPromo | 1477 DISABLED_FirstRunTabsContainSyncPromo |
1466 #else | 1478 #else |
1467 #define MAYBE_FirstRunTabsContainSyncPromo FirstRunTabsContainSyncPromo | 1479 #define MAYBE_FirstRunTabsContainSyncPromo FirstRunTabsContainSyncPromo |
1468 #endif | 1480 #endif |
1469 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, | 1481 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, |
1470 MAYBE_FirstRunTabsContainSyncPromo) { | 1482 MAYBE_FirstRunTabsContainSyncPromo) { |
1471 if (!PlatformSupportsSyncPromo()) | 1483 if (!PlatformSupportsSyncPromo()) |
1472 return; | 1484 return; |
1473 // Simulate the following master_preferences: | 1485 // Simulate the following master_preferences: |
1474 // { | 1486 // { |
1475 // "first_run_tabs" : [ | 1487 // "first_run_tabs" : [ |
1476 // "/title1.html", | 1488 // "/title1.html", |
1477 // "chrome://signin/?source=0&next_page=chrome%3A%2F%2Fnewtab%2F" | 1489 // "chrome://signin/?source=0&next_page=chrome%3A%2F%2Fnewtab%2F" |
1478 // ], | 1490 // ], |
1479 // "sync_promo": { | 1491 // "sync_promo": { |
1480 // "show_on_first_run_allowed": true | 1492 // "show_on_first_run_allowed": true |
1481 // } | 1493 // } |
1482 // } | 1494 // } |
1483 ASSERT_TRUE(embedded_test_server()->Start()); | 1495 ASSERT_TRUE(embedded_test_server()->Start()); |
1484 StartupBrowserCreator browser_creator; | 1496 StartupBrowserCreator browser_creator; |
1485 browser_creator.AddFirstRunTab( | 1497 browser_creator.AddFirstRunTab( |
1486 embedded_test_server()->GetURL("/title1.html")); | 1498 embedded_test_server()->GetURL("/title1.html")); |
1487 browser_creator.AddFirstRunTab( | 1499 browser_creator.AddFirstRunTab(signin::GetPromoURL( |
1488 signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false)); | 1500 signin_metrics::ACCESS_POINT_START_PAGE, |
| 1501 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false)); |
1489 browser()->profile()->GetPrefs()->SetBoolean( | 1502 browser()->profile()->GetPrefs()->SetBoolean( |
1490 prefs::kSignInPromoShowOnFirstRunAllowed, true); | 1503 prefs::kSignInPromoShowOnFirstRunAllowed, true); |
1491 | 1504 |
1492 // Do a process-startup browser launch. | 1505 // Do a process-startup browser launch. |
1493 base::CommandLine dummy(base::CommandLine::NO_PROGRAM); | 1506 base::CommandLine dummy(base::CommandLine::NO_PROGRAM); |
1494 StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator, | 1507 StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator, |
1495 chrome::startup::IS_FIRST_RUN); | 1508 chrome::startup::IS_FIRST_RUN); |
1496 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true, | 1509 ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true, |
1497 browser()->host_desktop_type())); | 1510 browser()->host_desktop_type())); |
1498 | 1511 |
1499 // This should have created a new browser window. | 1512 // This should have created a new browser window. |
1500 Browser* new_browser = FindOneOtherBrowser(browser()); | 1513 Browser* new_browser = FindOneOtherBrowser(browser()); |
1501 ASSERT_TRUE(new_browser); | 1514 ASSERT_TRUE(new_browser); |
1502 | 1515 |
1503 // Verify that the first-run tabs are shown and no sync promo has been added | 1516 // Verify that the first-run tabs are shown and no sync promo has been added |
1504 // as the first-run tabs contain it already. | 1517 // as the first-run tabs contain it already. |
1505 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 1518 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
1506 ASSERT_EQ(2, tab_strip->count()); | 1519 ASSERT_EQ(2, tab_strip->count()); |
1507 EXPECT_EQ("title1.html", | 1520 EXPECT_EQ("title1.html", |
1508 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); | 1521 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); |
1509 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 1522 EXPECT_EQ( |
1510 tab_strip->GetWebContentsAt(1)->GetURL()); | 1523 signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 1524 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false), |
| 1525 tab_strip->GetWebContentsAt(1)->GetURL()); |
1511 } | 1526 } |
1512 | 1527 |
1513 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) | 1528 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) |
1514 // http://crbug.com/314819 | 1529 // http://crbug.com/314819 |
1515 #define MAYBE_FirstRunTabsContainNTPSyncPromoAllowed \ | 1530 #define MAYBE_FirstRunTabsContainNTPSyncPromoAllowed \ |
1516 DISABLED_FirstRunTabsContainNTPSyncPromoAllowed | 1531 DISABLED_FirstRunTabsContainNTPSyncPromoAllowed |
1517 #else | 1532 #else |
1518 #define MAYBE_FirstRunTabsContainNTPSyncPromoAllowed \ | 1533 #define MAYBE_FirstRunTabsContainNTPSyncPromoAllowed \ |
1519 FirstRunTabsContainNTPSyncPromoAllowed | 1534 FirstRunTabsContainNTPSyncPromoAllowed |
1520 #endif | 1535 #endif |
(...skipping 27 matching lines...) Expand all Loading... |
1548 browser()->host_desktop_type())); | 1563 browser()->host_desktop_type())); |
1549 | 1564 |
1550 // This should have created a new browser window. | 1565 // This should have created a new browser window. |
1551 Browser* new_browser = FindOneOtherBrowser(browser()); | 1566 Browser* new_browser = FindOneOtherBrowser(browser()); |
1552 ASSERT_TRUE(new_browser); | 1567 ASSERT_TRUE(new_browser); |
1553 | 1568 |
1554 // Verify that the first-run tabs are shown but the NTP that they contain has | 1569 // Verify that the first-run tabs are shown but the NTP that they contain has |
1555 // been replaced by the sync promo. | 1570 // been replaced by the sync promo. |
1556 TabStripModel* tab_strip = new_browser->tab_strip_model(); | 1571 TabStripModel* tab_strip = new_browser->tab_strip_model(); |
1557 ASSERT_EQ(2, tab_strip->count()); | 1572 ASSERT_EQ(2, tab_strip->count()); |
1558 EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false), | 1573 EXPECT_EQ( |
1559 tab_strip->GetWebContentsAt(0)->GetURL()); | 1574 signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE, |
| 1575 signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false), |
| 1576 tab_strip->GetWebContentsAt(0)->GetURL()); |
1560 EXPECT_EQ("title1.html", | 1577 EXPECT_EQ("title1.html", |
1561 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); | 1578 tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); |
1562 } | 1579 } |
1563 | 1580 |
1564 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) | 1581 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) |
1565 // http://crbug.com/314819 | 1582 // http://crbug.com/314819 |
1566 #define MAYBE_FirstRunTabsContainNTPSyncPromoForbidden \ | 1583 #define MAYBE_FirstRunTabsContainNTPSyncPromoForbidden \ |
1567 DISABLED_FirstRunTabsContainNTPSyncPromoForbidden | 1584 DISABLED_FirstRunTabsContainNTPSyncPromoForbidden |
1568 #else | 1585 #else |
1569 #define MAYBE_FirstRunTabsContainNTPSyncPromoForbidden \ | 1586 #define MAYBE_FirstRunTabsContainNTPSyncPromoForbidden \ |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1718 ASSERT_EQ(1, tab_strip->count()); | 1735 ASSERT_EQ(1, tab_strip->count()); |
1719 EXPECT_EQ("title1.html", | 1736 EXPECT_EQ("title1.html", |
1720 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); | 1737 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); |
1721 } | 1738 } |
1722 #endif // defined(ENABLE_CONFIGURATION_POLICY) | 1739 #endif // defined(ENABLE_CONFIGURATION_POLICY) |
1723 | 1740 |
1724 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || | 1741 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || |
1725 // defined(ENABLE_CONFIGURATION_POLICY) | 1742 // defined(ENABLE_CONFIGURATION_POLICY) |
1726 | 1743 |
1727 #endif // !defined(OS_CHROMEOS) | 1744 #endif // !defined(OS_CHROMEOS) |
OLD | NEW |