[Desktop FRE] Do not show Welcome page to profiles created in M56 or M57

chrome/browser/profiles/profile_manager.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/profiles/profile_manager.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
@@ skipping 39 matching lines @@
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_util.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ skipping 919 matching lines @@
   if (force_supervised_user_id) {
     supervised_user_id =
         command_line->GetSwitchValueASCII(switches::kSupervisedUserId);
   }
   if (force_supervised_user_id ||
       !profile->GetPrefs()->HasPrefPath(prefs::kSupervisedUserId)) {
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    supervised_user_id);
   }
 #if !defined(OS_ANDROID)
-  // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is
-  // new even if the "Preferences" file already existed (For example: The
-  // master_preferences file is dumped into the default profile on first run,
-  // before profile creation).
-  if (profile->IsNewProfile() || first_run::IsChromeFirstRun())
-    profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
+  if (StartupBrowserCreator::UseConsolidatedFlow()) {
+    // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile
+    // is new even if the "Preferences" file already existed (For example: The
+    // master_preferences file is dumped into the default profile on first run,
+    // before profile creation).
+    if (profile->IsNewProfile() || first_run::IsChromeFirstRun())
+      profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
+  }
 #endif
 }
 
 void ProfileManager::RegisterTestingProfile(Profile* profile,
                                             bool add_to_storage,
                                             bool start_deferred_task_runners) {
   RegisterProfile(profile, true);
   if (add_to_storage) {
     InitProfileUserPrefs(profile);
     AddProfileToStorage(profile);
@@ skipping 778 matching lines @@
 
   const base::FilePath new_active_profile_dir =
       found_entry ? found_entry->GetPath() : GenerateNextProfileDirectoryPath();
   FinishDeletingProfile(profile_dir, new_active_profile_dir);
 }
 #endif  // !defined(OS_ANDROID)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }