| Index: chrome/browser/ui/startup/startup_tab_provider_unittest.cc
|
| diff --git a/chrome/browser/ui/startup/startup_tab_provider_unittest.cc b/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
|
| index b1567fd0a75ac9ff7ede77434d9a9b4b17debba9..068e032bb4ab3993c4211b1653d932cd19114c05 100644
|
| --- a/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
|
| +++ b/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
|
| @@ -9,17 +9,18 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "url/gurl.h"
|
|
|
| -TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy) {
|
| +TEST(StartupTabProviderTest, GetStandardOnboardingTabsForState) {
|
| // Show welcome page to new unauthenticated profile on first run.
|
| - StartupTabs output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
|
| - true, false, false, false);
|
| + StartupTabs output =
|
| + StartupTabProviderImpl::GetStandardOnboardingTabsForState(true, false,
|
| + false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url);
|
| EXPECT_FALSE(output[0].is_pinned);
|
|
|
| // After first run, display welcome page using variant view.
|
| - output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetStandardOnboardingTabsForState(
|
| false, false, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -27,31 +28,32 @@ TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy) {
|
| EXPECT_FALSE(output[0].is_pinned);
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy_Negative) {
|
| +TEST(StartupTabProviderTest, GetStandardOnboardingTabsForState_Negative) {
|
| // Do not show the welcome page to the same profile twice.
|
| - StartupTabs output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
|
| - true, true, false, false);
|
| + StartupTabs output =
|
| + StartupTabProviderImpl::GetStandardOnboardingTabsForState(true, true,
|
| + false, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
|
|
| // Do not show the welcome page to authenticated users.
|
| - output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetStandardOnboardingTabsForState(
|
| true, false, true, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
|
|
| // Do not show the welcome page to supervised users.
|
| - output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetStandardOnboardingTabsForState(
|
| true, false, false, true);
|
|
|
| EXPECT_TRUE(output.empty());
|
| }
|
|
|
| #if defined(OS_WIN)
|
| -TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy) {
|
| +TEST(StartupTabProviderTest, GetWin10OnboardingTabsForState) {
|
| // Show Win 10 Welcome page if it has not been seen, but the standard page
|
| // has.
|
| - StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, true, false, false, true, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -61,7 +63,7 @@ TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy) {
|
|
|
| // Show standard Welcome page if the Win 10 Welcome page has been seen, but
|
| // the standard page has not.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, false, true, false, true, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -70,7 +72,7 @@ TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy) {
|
|
|
| // If neither page has been seen, the Win 10 Welcome page takes precedence
|
| // this launch.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, false, false, false, true, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -79,10 +81,10 @@ TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy) {
|
| EXPECT_FALSE(output[0].is_pinned);
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_LaterRunVariant) {
|
| +TEST(StartupTabProviderTest, GetWin10OnboardingTabsForState_LaterRunVariant) {
|
| // Show a variant of the Win 10 Welcome page after first run, if it has not
|
| // been seen.
|
| - StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| false, false, false, false, true, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -92,7 +94,7 @@ TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_LaterRunVariant) {
|
|
|
| // Show a variant of the standard Welcome page after first run, if the Win 10
|
| // Welcome page has already been seen but the standard has not.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| false, false, true, false, true, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -100,22 +102,22 @@ TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_LaterRunVariant) {
|
| EXPECT_FALSE(output[0].is_pinned);
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_Negative) {
|
| +TEST(StartupTabProviderTest, GetWin10OnboardingTabsForState_Negative) {
|
| // Do not show either page if it has already been shown.
|
| - StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, true, true, false, true, false, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
|
|
| // Do not show either page to supervised users.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, false, false, false, true, false, true);
|
|
|
| EXPECT_TRUE(output.empty());
|
|
|
| // If Chrome is already the default browser, don't show the Win 10 Welcome
|
| // page, and don't preempt the standard Welcome page.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, false, false, false, true, true, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -123,16 +125,16 @@ TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_Negative) {
|
| EXPECT_FALSE(output[0].is_pinned);
|
|
|
| // If the user is signed in, block showing the standard Welcome page.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, false, true, true, true, false, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
| }
|
|
|
| TEST(StartupTabProviderTest,
|
| - CheckWin10OnboardingTabPolicy_SetDefaultBrowserNotAllowed) {
|
| + GetWin10OnboardingTabsForState_SetDefaultBrowserNotAllowed) {
|
| // Skip the Win 10 promo if setting the default browser is not allowed.
|
| - StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, false, false, false, false, false, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| @@ -140,7 +142,7 @@ TEST(StartupTabProviderTest,
|
|
|
| // After first run, no onboarding content is displayed when setting the
|
| // default browser is not allowed.
|
| - output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
|
| + output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
|
| true, true, false, false, false, false, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
| @@ -148,13 +150,13 @@ TEST(StartupTabProviderTest,
|
|
|
| #endif
|
|
|
| -TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy) {
|
| +TEST(StartupTabProviderTest, GetMasterPrefsTabsForState) {
|
| std::vector<GURL> input = {GURL(base::ASCIIToUTF16("https://new_tab_page")),
|
| GURL(base::ASCIIToUTF16("https://www.google.com")),
|
| GURL(base::ASCIIToUTF16("https://welcome_page"))};
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckMasterPrefsTabPolicy(true, input);
|
| + StartupTabProviderImpl::GetMasterPrefsTabsForState(true, input);
|
|
|
| ASSERT_EQ(3U, output.size());
|
| EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
|
| @@ -165,18 +167,19 @@ TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy) {
|
| EXPECT_FALSE(output[2].is_pinned);
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy_FirstRunOnly) {
|
| +TEST(StartupTabProviderTest, GetMasterPrefsTabsForState_FirstRunOnly) {
|
| std::vector<GURL> input = {
|
| GURL(base::ASCIIToUTF16("https://www.google.com"))};
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckMasterPrefsTabPolicy(false, input);
|
| + StartupTabProviderImpl::GetMasterPrefsTabsForState(false, input);
|
|
|
| EXPECT_TRUE(output.empty());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckResetTriggerTabPolicy) {
|
| - StartupTabs output = StartupTabProviderImpl::CheckResetTriggerTabPolicy(true);
|
| +TEST(StartupTabProviderTest, GetResetTriggerTabsForState) {
|
| + StartupTabs output =
|
| + StartupTabProviderImpl::GetResetTriggerTabsForState(true);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ(StartupTabProviderImpl::GetTriggeredResetSettingsUrl(),
|
| @@ -184,99 +187,99 @@ TEST(StartupTabProviderTest, CheckResetTriggerTabPolicy) {
|
| EXPECT_FALSE(output[0].is_pinned);
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckResetTriggerTabPolicy_Negative) {
|
| +TEST(StartupTabProviderTest, GetResetTriggerTabsForState_Negative) {
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckResetTriggerTabPolicy(false);
|
| + StartupTabProviderImpl::GetResetTriggerTabsForState(false);
|
|
|
| ASSERT_TRUE(output.empty());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckPinnedTabPolicy) {
|
| +TEST(StartupTabProviderTest, GetPinnedTabsForState) {
|
| StartupTabs pinned = {StartupTab(GURL("https://www.google.com"), true)};
|
| SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
|
| SessionStartupPref pref_urls(SessionStartupPref::Type::URLS);
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckPinnedTabPolicy(pref_default, pinned);
|
| + StartupTabProviderImpl::GetPinnedTabsForState(pref_default, pinned);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ("www.google.com", output[0].url.host());
|
|
|
| - output = StartupTabProviderImpl::CheckPinnedTabPolicy(pref_urls, pinned);
|
| + output = StartupTabProviderImpl::GetPinnedTabsForState(pref_urls, pinned);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ("www.google.com", output[0].url.host());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckPinnedTabPolicy_Negative) {
|
| +TEST(StartupTabProviderTest, GetPinnedTabsForState_Negative) {
|
| StartupTabs pinned = {StartupTab(GURL("https://www.google.com"), true)};
|
| SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckPinnedTabPolicy(pref_last, pinned);
|
| + StartupTabProviderImpl::GetPinnedTabsForState(pref_last, pinned);
|
|
|
| ASSERT_TRUE(output.empty());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckPreferencesTabPolicy) {
|
| +TEST(StartupTabProviderTest, GetPreferencesTabsForState) {
|
| SessionStartupPref pref(SessionStartupPref::Type::URLS);
|
| pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckPreferencesTabPolicy(pref, false);
|
| + StartupTabProviderImpl::GetPreferencesTabsForState(pref, false);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ("www.google.com", output[0].url.host());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_WrongType) {
|
| +TEST(StartupTabProviderTest, GetPreferencesTabsForState_WrongType) {
|
| SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
|
| pref_default.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_default, false);
|
| + StartupTabProviderImpl::GetPreferencesTabsForState(pref_default, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
|
|
| SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
|
| pref_last.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
|
|
|
| - output = StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_last, false);
|
| + output = StartupTabProviderImpl::GetPreferencesTabsForState(pref_last, false);
|
|
|
| EXPECT_TRUE(output.empty());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_NotFirstBrowser) {
|
| +TEST(StartupTabProviderTest, GetPreferencesTabsForState_NotFirstBrowser) {
|
| SessionStartupPref pref(SessionStartupPref::Type::URLS);
|
| pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckPreferencesTabPolicy(pref, true);
|
| + StartupTabProviderImpl::GetPreferencesTabsForState(pref, true);
|
|
|
| EXPECT_TRUE(output.empty());
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckNewTabPageTabPolicy) {
|
| +TEST(StartupTabProviderTest, GetNewTabPageTabsForState) {
|
| SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
|
| SessionStartupPref pref_urls(SessionStartupPref::Type::URLS);
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_default);
|
| + StartupTabProviderImpl::GetNewTabPageTabsForState(pref_default);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
|
|
|
| - output = StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_urls);
|
| + output = StartupTabProviderImpl::GetNewTabPageTabsForState(pref_urls);
|
|
|
| ASSERT_EQ(1U, output.size());
|
| EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
|
| }
|
|
|
| -TEST(StartupTabProviderTest, CheckNewTabPageTabPolicy_Negative) {
|
| +TEST(StartupTabProviderTest, GetNewTabPageTabsForState_Negative) {
|
| SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
|
|
|
| StartupTabs output =
|
| - StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_last);
|
| + StartupTabProviderImpl::GetNewTabPageTabsForState(pref_last);
|
|
|
| ASSERT_TRUE(output.empty());
|
| }
|
|
|