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

chrome/browser/ui/startup/startup_browser_creator_impl.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 643 matching lines @@
     return distribution_tabs;
 
   // Policies for onboarding (e.g., first run) may show promotional and
   // introductory content depending on a number of system status factors,
   // including OS and whether or not this is First Run.
   StartupTabs onboarding_tabs = provider.GetOnboardingTabs();
   AppendTabs(onboarding_tabs, &tabs);
 
   // If the user has set the preference indicating URLs to show on opening,
   // read and add those.
-  StartupTabs prefs_tabs = provider.GetPreferencesTabs();
+  StartupTabs prefs_tabs = provider.GetPreferencesTabs(command_line_, profile_);
   AppendTabs(prefs_tabs, &tabs);
 
   // Potentially add the New Tab Page. Onboarding content is designed to
   // replace (and eventually funnel the user to) the NTP. Likewise, URLs read
   // from preferences are explicitly meant to override showing the NTP.
   if (onboarding_tabs.empty() && prefs_tabs.empty())
     tabs.emplace_back(GURL(chrome::kChromeUINewTabURL), false);
 
   // Add any tabs which the user has previously pinned.
-  AppendTabs(provider.GetPinnedTabs(), &tabs);
+  AppendTabs(provider.GetPinnedTabs(profile_), &tabs);
 
   return tabs;
 }
 
 void StartupBrowserCreatorImpl::AddUniqueURLs(const std::vector<GURL>& urls,
                                               StartupTabs* tabs) {
   size_t num_existing_tabs = tabs->size();
   for (size_t i = 0; i < urls.size(); ++i) {
     bool in_tabs = false;
     for (size_t j = 0; j < num_existing_tabs; ++j) {

[Peter Kasting, 2016/10/19 21:17:56]

Note: In this CL or a future one, consider applying improvement suggestions from
https://codereview.chromium.org/2164033002/diff/400001/chrome/browser/ui/star...
.

[tmartino, 2016/10/19 22:01:29]

Haven't forgotten about this! However, this is part of the dedupe logic that
we've decided not to carry forward, so we can just deprecate this chunk of code
entirely.

Since I'm viewing this CL as a merge candidate, I'm going to hold off marking
the deprecation for the moment as a matter of scoping. (Any sort of reordering
touches a lot of code and therefore makes me nervous.)

       if (urls[i] == (*tabs)[j].url) {
         in_tabs = true;
         break;
       }
     }
     if (!in_tabs) {
       StartupTab tab;
       tab.is_pinned = false;
       tab.url = urls[i];
       tabs->push_back(tab);
@@ skipping 386 matching lines @@
 #if defined(OS_WIN)
   TriggeredProfileResetter* triggered_profile_resetter =
       TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
   // TriggeredProfileResetter instance will be nullptr for incognito profiles.
   if (triggered_profile_resetter) {
     has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
   }
 #endif  // defined(OS_WIN)
   return has_reset_trigger;
 }