Adding Pinned Tab and Preferences-specified Tab logic to Startup Flow refactor

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"
 #include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 StartupTabs StartupTabProviderImpl::GetOnboardingTabs() const {
 #if defined(OS_WIN)
@@ skipping 23 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() const {
-  // TODO(tmartino): Copy/clean up logic from
-  // StartupBrowserCreatorImpl::ProcessSpecifiedUrls.
-  return StartupTabs();
+StartupTabs StartupTabProviderImpl::GetPinnedTabs(Profile* profile) const {
+  return PinnedTabCodec::ReadPinnedTabs(profile);
 }
 
-StartupTabs StartupTabProviderImpl::GetPreferencesTabs() const {
-  // TODO(tmartino): Copy/clean up logic from
-  // StartupBrowserCreatorImpl::ProcessStartupUrls.
-  return StartupTabs();
+StartupTabs StartupTabProviderImpl::GetPreferencesTabs(
+    const base::CommandLine& command_line,
+    Profile* profile) const {
+  return CheckPreferencesTabPolicy(
+      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
 StartupTabs StartupTabProviderImpl::CheckMasterPrefsTabPolicy(
     bool is_first_run,
     const std::vector<GURL>& first_run_tabs) {
   // Constants: Magic words used by Master Preferences files in place of a URL
   // host to indicate that internal pages should appear on first run.
-  constexpr char kNewTabUrlHost[] = "new_tab_page";
-  constexpr char kWelcomePageUrlHost[] = "welcome_page";
+  static constexpr char kNewTabUrlHost[] = "new_tab_page";
+  static constexpr char kWelcomePageUrlHost[] = "welcome_page";
 
   StartupTabs tabs;
   if (is_first_run) {
     tabs.reserve(first_run_tabs.size());
     for (GURL url : first_run_tabs) {
       if (url.host() == kNewTabUrlHost)
         url = GURL(chrome::kChromeUINewTabURL);
       else if (url.host() == kWelcomePageUrlHost)
         url = GetWelcomePageUrl();
       tabs.emplace_back(url, false);
     }
   }
   return tabs;
 }
 
 // static
 StartupTabs StartupTabProviderImpl::CheckResetTriggerTabPolicy(
     bool profile_has_trigger) {
   StartupTabs tabs;
   if (profile_has_trigger)
     tabs.emplace_back(GetTriggeredResetSettingsUrl(), false);
   return tabs;
 }
 
 // static
+StartupTabs StartupTabProviderImpl::CheckPreferencesTabPolicy(
+    SessionStartupPref pref) {

[grt (UTC plus 2), 2016/10/24 06:55:35]

should this be passed by const-ref since it contains a vector of GURLs?

+  StartupTabs tabs;
+  if (pref.type == SessionStartupPref::Type::URLS && !pref.urls.empty()) {
+    for (auto& url : pref.urls)

[grt (UTC plus 2), 2016/10/24 06:55:35]

nit: "const auto&"

+      tabs.push_back(StartupTab(url, false));
+  }
+  return tabs;
+}
+
+// static
 GURL StartupTabProviderImpl::GetWelcomePageUrl() {
   return GURL(chrome::kChromeUIWelcomeURL);
 }
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }