Completing refactor of startup_browser_creator_impl

chrome/browser/ui/startup/startup_tab_provider.cc

 // 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_tab_provider.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
@@ skipping 35 matching lines @@
 
 StartupTabs StartupTabProviderImpl::GetResetTriggerTabs(
     Profile* profile) const {
   auto* triggered_profile_resetter =
       TriggeredProfileResetterFactory::GetForBrowserContext(profile);
   bool has_reset_trigger = triggered_profile_resetter &&
                            triggered_profile_resetter->HasResetTrigger();
   return CheckResetTriggerTabPolicy(has_reset_trigger);
 }
 
-StartupTabs StartupTabProviderImpl::GetPinnedTabs(Profile* profile) const {
-  return PinnedTabCodec::ReadPinnedTabs(profile);
+StartupTabs StartupTabProviderImpl::GetPinnedTabs(
+    const base::CommandLine& command_line,
+    Profile* profile) const {
+  return CheckPinnedTabPolicy(
+      StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
+      PinnedTabCodec::ReadPinnedTabs(profile));
 }
 
 StartupTabs StartupTabProviderImpl::GetPreferencesTabs(
     const base::CommandLine& command_line,
     Profile* profile) const {
   return CheckPreferencesTabPolicy(
       StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
 }
 
+StartupTabs StartupTabProviderImpl::GetNewTabPageTabs(
+    const base::CommandLine& command_line,
+    Profile* profile) const {
+  return CheckNewTabPageTabPolicy(
+      StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
+}
+
 // static
 StartupTabs StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
     bool is_first_run) {
   StartupTabs tabs;
   if (is_first_run)
     tabs.emplace_back(GetWelcomePageUrl(), false);
   return tabs;
 }
 
 // static
@@ skipping 22 matching lines @@
 // static
 StartupTabs StartupTabProviderImpl::CheckResetTriggerTabPolicy(
     bool profile_has_trigger) {
   StartupTabs tabs;
   if (profile_has_trigger)
     tabs.emplace_back(GetTriggeredResetSettingsUrl(), false);
   return tabs;
 }
 
 // static
+StartupTabs StartupTabProviderImpl::CheckPinnedTabPolicy(
+    const SessionStartupPref& pref,
+    const StartupTabs& pinned_tabs) {
+  return (pref.type == SessionStartupPref::Type::LAST) ? StartupTabs()
+                                                       : pinned_tabs;
+}
+
+// static
 StartupTabs StartupTabProviderImpl::CheckPreferencesTabPolicy(
-    SessionStartupPref pref) {
+    const SessionStartupPref& pref) {
   StartupTabs tabs;
   if (pref.type == SessionStartupPref::Type::URLS && !pref.urls.empty()) {
-    for (auto& url : pref.urls)
+    for (const auto& url : pref.urls)
       tabs.push_back(StartupTab(url, false));
   }
   return tabs;
 }
 
 // static
+StartupTabs StartupTabProviderImpl::CheckNewTabPageTabPolicy(
+    const SessionStartupPref& pref) {
+  StartupTabs tabs;
+  if (pref.type != SessionStartupPref::Type::LAST)
+    tabs.emplace_back(GURL(chrome::kChromeUINewTabURL), false);
+  return tabs;
+}
+
+// static
 GURL StartupTabProviderImpl::GetWelcomePageUrl() {
   return GURL(chrome::kChromeUIWelcomeURL);
 }
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }