Completing refactor of startup_browser_creator_impl

chrome/browser/ui/startup/startup_tab_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_
 #define CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 17 matching lines @@
   // specific to this distribution. Transforms any such URLs per policy and
   // returns them. Also clears the value of first_run_urls_ in the provided
   // BrowserCreator.
   virtual StartupTabs GetDistributionFirstRunTabs(
       StartupBrowserCreator* browser_creator) const = 0;
 
   // Checks for the presence of a trigger indicating the need to offer a Profile
   // Reset on this profile. Returns any tabs which should be shown accordingly.
   virtual StartupTabs GetResetTriggerTabs(Profile* profile) const = 0;
 
-  // Returns the user's pinned tabs.
-  virtual StartupTabs GetPinnedTabs(Profile* profile) const = 0;
+  // Returns the user's pinned tabs, if they should be shown.
+  virtual StartupTabs GetPinnedTabs(const base::CommandLine& command_line,
+                                    Profile* profile) const = 0;
 
   // Returns tabs, if any, specified in the user's preferences as the default
   // content for a new window.
   virtual StartupTabs GetPreferencesTabs(const base::CommandLine& command_line,
                                          Profile* profile) const = 0;
+
+  // Possibly returns the New Tab Page, if the user's preferences indicate a

[Peter Kasting, 2016/10/31 19:24:06]

Nit: No need for "Possibly"

[tmartino, 2016/11/02 16:34:00]

Done

+  // configuration where it must be passed explicitly.
+  virtual StartupTabs GetNewTabPageTabs(const base::CommandLine& command_line,
+                                        Profile* profile) const = 0;
 };
 
 class StartupTabProviderImpl : public StartupTabProvider {
  public:
   StartupTabProviderImpl() = default;
 
   // The static Check*TabPolicy methods below enforce the policies relevant to
   // the respective Get*Tabs methods, but do not gather or interact with any
   // system state relating to making those policy decisions.
 
   // Determines which tabs which should be shown according to onboarding/first
   // run policy.
   static StartupTabs CheckStandardOnboardingTabPolicy(bool is_first_run);
 
   // Processes first run URLs specified in Master Preferences file, replacing
   // any "magic word" URL hosts with appropriate URLs.
   static StartupTabs CheckMasterPrefsTabPolicy(
       bool is_first_run,
       const std::vector<GURL>& first_run_tabs);
 
   // Determines which tabs should be shown as a result of the presence/absence
   // of a Reset Trigger on this profile.
   static StartupTabs CheckResetTriggerTabPolicy(bool profile_has_trigger);
 
+  // Determines whether the startup preference requires the contents of
+  // |pinned_tabs| to be shown. This is needed to avoid duplicates, as the
+  // session restore logic will also resurface pinned tabs on its own.
+  static StartupTabs CheckPinnedTabPolicy(const SessionStartupPref& pref,
+                                          const StartupTabs& pinned_tabs);
+
   // Determines whether preferences indicate that user-specified tabs should be
   // shown as the default new window content, and returns the specified tabs if
   // so.
-  static StartupTabs CheckPreferencesTabPolicy(SessionStartupPref pref);
+  static StartupTabs CheckPreferencesTabPolicy(const SessionStartupPref& pref);
+
+  // Determines whether startup preferences require the New Tab Page to be
+  // explicitly specified. Session Restore does not expect the NTP to be passed.
+  static StartupTabs CheckNewTabPageTabPolicy(const SessionStartupPref& pref);
 
   // Gets the URL for the "Welcome to Chrome" page.
   static GURL GetWelcomePageUrl();
 
   // Gets the URL for the page which offers to reset the user's profile
   // settings.
   static GURL GetTriggeredResetSettingsUrl();
 
   // StartupTabProvider:
   StartupTabs GetOnboardingTabs() const override;
   StartupTabs GetDistributionFirstRunTabs(
       StartupBrowserCreator* browser_creator) const override;
   StartupTabs GetResetTriggerTabs(Profile* profile) const override;
-  StartupTabs GetPinnedTabs(Profile* profile) const override;
+  StartupTabs GetPinnedTabs(const base::CommandLine& command_line,
+                            Profile* profile) const override;
   StartupTabs GetPreferencesTabs(const base::CommandLine& command_line,
                                  Profile* profile) const override;
+  StartupTabs GetNewTabPageTabs(const base::CommandLine& command_line,
+                                Profile* profile) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StartupTabProviderImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_