Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc

Issue 2164033002: Refactoring startup logic for upcoming FRE changes (non-Win 10). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Further tweaks to conditionals Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc b/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3ebdf09492e9c73acb58f2f7cd55132d9497c604
--- /dev/null
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc
@@ -0,0 +1,185 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
+
+#include "base/command_line.h"
+#include "chrome/browser/ui/startup/startup_tab_provider.h"
+#include "chrome/common/url_constants.cc"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class StartupBrowserCreatorImplTest : public testing::Test {};
grt (UTC plus 2) 2016/09/26 20:11:14 i believe this is unused since you're using TEST r
+
+// Bits for FakeStartupTabProvider options.
grt (UTC plus 2) 2016/09/26 20:11:14 nit: wrap lines 14-77 in an unnamed namespace
+constexpr uint32_t kOnboardingTabs = 0x01;
+constexpr uint32_t kDistributionFirstRunTabs = 0x02;
+constexpr uint32_t kResetTriggerTabs = 0x04;
+constexpr uint32_t kPinnedTabs = 0x08;
+constexpr uint32_t kPreferencesTabs = 0x10;
+
+class FakeStartupTabProvider : public StartupTabProvider {
+ public:
+ // For each option passed, the corresponding adder below will add a sentinel
+ // tab and return true. For options not passed, the adder will return false.
+ explicit FakeStartupTabProvider(uint32_t options) : options_(options) {}
+
+ bool AddOnboardingTabs(StartupTabs* tabs) const override {
+ if (options_ & kOnboardingTabs) {
+ tabs->push_back(StartupTab(GURL("https://onboarding"), false));
+ return true;
+ }
+ return false;
+ }
+
+ bool AddDistributionFirstRunTabs(StartupBrowserCreator* browser_creator,
+ StartupTabs* tabs) const override {
+ if (options_ & kDistributionFirstRunTabs) {
+ tabs->push_back(StartupTab(GURL("https://distribution"), false));
+ return true;
+ }
+ return false;
+ }
+
+ bool AddResetTriggerTabs(Profile* profile, StartupTabs* tabs) const override {
+ if (options_ & kResetTriggerTabs) {
+ tabs->push_back(StartupTab(GURL("https://reset-trigger"), false));
+ return true;
+ }
+ return false;
+ }
+
+ bool AddPinnedTabs(StartupTabs* tabs) const override {
+ if (options_ & kPinnedTabs) {
+ tabs->push_back(StartupTab(GURL("https://pinned"), true));
+ return true;
+ }
+ return false;
+ }
+
+ bool AddPreferencesTabs(StartupTabs* tabs) const override {
+ if (options_ & kPreferencesTabs) {
+ tabs->push_back(StartupTab(GURL("https://prefs"), false));
+ return true;
+ }
+ return false;
+ }
+
+ private:
+ const uint32_t options_;
+};
+
+StartupTabs GetSentinelCommandLineTabs() {
+ StartupTabs cmd_line_tabs;
+ cmd_line_tabs.push_back(StartupTab(GURL("https://cmd-line"), false));
+ return cmd_line_tabs;
+}
+
+// "Standard" case: Tabs specified in onboarding, reset trigger, pinned tabs, or
+// preferences shouldn't interfere with each other. Nothing specified on the
+// command line. Reset trigger always appears first.
+TEST(StartupBrowserCreatorImplTest, DetermineStartupTabs) {
+ FakeStartupTabProvider provider(kOnboardingTabs | kResetTriggerTabs |
+ kPinnedTabs | kPreferencesTabs);
+ StartupBrowserCreatorImpl impl(
+ base::FilePath(), base::CommandLine(base::CommandLine::NO_PROGRAM),
+ chrome::startup::IS_FIRST_RUN);
+ StartupTabs no_tabs;
+
+ StartupTabs output =
+ impl.DetermineStartupTabs(provider, no_tabs, false, false);
+ ASSERT_EQ(4U, output.size());
+ EXPECT_EQ("reset-trigger", output[0].url.host());
+ EXPECT_EQ("onboarding", output[1].url.host());
+ EXPECT_EQ("prefs", output[2].url.host());
+ EXPECT_EQ("pinned", output[3].url.host());
+}
+
+// All content is blocked in Incognito mode, or when recovering from a crash.
+// Only the New Tab Page should appear in either case.
+TEST(StartupBrowserCreatorImplTest, DetermineStartupTabs_IncognitoOrCrash) {
+ FakeStartupTabProvider provider(kOnboardingTabs | kDistributionFirstRunTabs |
+ kResetTriggerTabs | kPinnedTabs |
+ kPreferencesTabs);
+ StartupBrowserCreatorImpl impl(
+ base::FilePath(), base::CommandLine(base::CommandLine::NO_PROGRAM),
+ chrome::startup::IS_FIRST_RUN);
+ StartupTabs no_tabs;
+
+ // Incognito
+ StartupTabs output =
+ impl.DetermineStartupTabs(provider, no_tabs, true, false);
+ ASSERT_EQ(1U, output.size());
+ EXPECT_EQ(GURL(chrome::kChromeUINewTabURL).host(), output[0].url.host());
+
+ // Crash Recovery
+ output = impl.DetermineStartupTabs(provider, no_tabs, false, true);
+ ASSERT_EQ(1U, output.size());
+ EXPECT_EQ(GURL(chrome::kChromeUINewTabURL).host(), output[0].url.host());
+}
+
+// If Master Preferences specifies content, this should block all other
+// policies. The only exception is command line URLs, tested below.
+TEST(StartupBrowserCreatorImplTest, DetermineStartupTabs_MasterPrefs) {
+ FakeStartupTabProvider provider(kOnboardingTabs | kDistributionFirstRunTabs |
+ kResetTriggerTabs | kPinnedTabs |
+ kPreferencesTabs);
+ StartupBrowserCreatorImpl impl(
+ base::FilePath(), base::CommandLine(base::CommandLine::NO_PROGRAM),
+ chrome::startup::IS_FIRST_RUN);
+ StartupTabs no_tabs;
+
+ StartupTabs output =
+ impl.DetermineStartupTabs(provider, no_tabs, false, false);
+ ASSERT_EQ(1U, output.size());
+ EXPECT_EQ("distribution", output[0].url.host());
+}
+
+// URLs specified on the command line should always appear, and should block
+// all other tabs except the Reset Trigger tab.
+TEST(StartupBrowserCreatorImplTest, DetermineStartupTabs_CommandLine) {
+ FakeStartupTabProvider provider(kOnboardingTabs | kDistributionFirstRunTabs |
+ kResetTriggerTabs | kPinnedTabs |
+ kPreferencesTabs);
+ StartupBrowserCreatorImpl impl(
+ base::FilePath(), base::CommandLine(base::CommandLine::NO_PROGRAM),
+ chrome::startup::IS_FIRST_RUN);
+
+ StartupTabs cmd_line_tabs = GetSentinelCommandLineTabs();
+
+ StartupTabs output =
+ impl.DetermineStartupTabs(provider, cmd_line_tabs, false, false);
+ ASSERT_EQ(2U, output.size());
+ EXPECT_EQ("reset-trigger", output[0].url.host());
+ EXPECT_EQ("cmd-line", output[1].url.host());
+
+ // Also test that both incognito and crash recovery don't interfere with
+ // command line tabs.
+
+ // Incognito
+ output = impl.DetermineStartupTabs(provider, cmd_line_tabs, true, false);
+ ASSERT_EQ(1U, output.size());
+ EXPECT_EQ("cmd-line", output[0].url.host());
+
+ // Crash Recovery
+ output = impl.DetermineStartupTabs(provider, cmd_line_tabs, false, true);
+ ASSERT_EQ(1U, output.size());
+ EXPECT_EQ("cmd-line", output[0].url.host());
+}
+
+// New Tab Page should appear alongside pinned tabs and the reset trigger, but
+// should be superseded by onboarding tabs and by tabs specified in preferences.
+TEST(StartupBrowserCreatorImplTest, DetermineStartupTabs_NewTabPage) {
+ FakeStartupTabProvider provider_allows_ntp(kPinnedTabs | kResetTriggerTabs);
+ StartupBrowserCreatorImpl impl(
+ base::FilePath(), base::CommandLine(base::CommandLine::NO_PROGRAM),
+ chrome::startup::IS_FIRST_RUN);
+ StartupTabs no_tabs;
+
+ StartupTabs output =
+ impl.DetermineStartupTabs(provider_allows_ntp, no_tabs, false, false);
+ ASSERT_EQ(3U, output.size());
+ EXPECT_EQ("reset-trigger", output[0].url.host());
+ EXPECT_EQ(GURL(chrome::kChromeUINewTabURL).host(), output[1].url.host());
+ EXPECT_EQ("pinned", output[2].url.host());
+}

Powered by Google App Engine
This is Rietveld 408576698