[Desktop FRE] Fix incorrect emission of histogram

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 "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
@@ skipping 153 matching lines @@
     bool is_default_browser,
     bool is_supervised_user) {
   StartupTabs tabs;
 
   if (is_supervised_user)
     return tabs;
 
   if (set_default_browser_allowed && !has_seen_win10_promo &&
       !is_default_browser) {
     tabs.emplace_back(GetWin10WelcomePageUrl(!is_first_run), false);
-  } else if (!has_seen_welcome_page && is_signin_allowed && !is_signed_in) {
-    tabs.emplace_back(GetWelcomePageUrl(!is_first_run), false);
+    return tabs;
   }
-  return tabs;
+
+  return GetStandardOnboardingTabsForState(is_first_run, has_seen_welcome_page,
+                                           is_signin_allowed, is_signed_in,
+                                           is_supervised_user);
 }
 #endif
 
 // static
 StartupTabs StartupTabProviderImpl::GetMasterPrefsTabsForState(
     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.
   static constexpr char kNewTabUrlHost[] = "new_tab_page";
@@ skipping 50 matching lines @@
 StartupTabs StartupTabProviderImpl::GetNewTabPageTabsForState(
     const SessionStartupPref& pref) {
   StartupTabs tabs;
   if (pref.type != SessionStartupPref::Type::LAST)
     tabs.emplace_back(GURL(chrome::kChromeUINewTabURL), false);
   return tabs;
 }
 
 // static
 GURL StartupTabProviderImpl::GetWelcomePageUrl(bool use_later_run_variant) {
-  // Record that the Welcome page was added to the startup url list.
-  UMA_HISTOGRAM_BOOLEAN("Welcome.Win10.NewPromoPageAdded", true);
   GURL url(chrome::kChromeUIWelcomeURL);
   return use_later_run_variant
              ? net::AppendQueryParameter(url, "variant", "everywhere")
              : url;
 }
 
 #if defined(OS_WIN)
 // static
 GURL StartupTabProviderImpl::GetWin10WelcomePageUrl(
     bool use_later_run_variant) {
+  // Record that the Welcome page was added to the startup url list.
+  UMA_HISTOGRAM_BOOLEAN("Welcome.Win10.NewPromoPageAdded", true);
   GURL url(chrome::kChromeUIWelcomeWin10URL);
   return use_later_run_variant
              ? net::AppendQueryParameter(url, "text", "faster")
              : url;
 }
 #endif
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }