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

chrome/browser/ui/startup/startup_browser_creator_impl.cc

Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 7a2e089279b4501710be7bdc0e35569f03d1d4a7..234f6bdbbb7b304dd01ed6cc8c979f1c975e6e41 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -72,7 +72,6 @@
 #include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h"
 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
-#include "chrome/browser/ui/startup/startup_features.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
@@ -283,14 +282,16 @@ void AppendTabs(const StartupTabs& from, StartupTabs* to) {
     to->insert(to->end(), from.begin(), from.end());
 }
 
-// Determines whether the Consolidated startup flow should be used, based on
-// the kUseConsolidatedStartupFlow Feature. Not enabled on Windows 10+.
-bool UseConsolidatedFlow() {
-#if defined(OS_WIN)
-  if (base::win::GetVersion() >= base::win::VERSION_WIN10)
-    return base::FeatureList::IsEnabled(features::kEnableWelcomeWin10);
-#endif  // defined(OS_WIN)
-  return base::FeatureList::IsEnabled(features::kUseConsolidatedStartupFlow);
+// Prevent profiles created in M56 from seeing Welcome page. See
+// crbug.com/704977.
+// TODO(tmartino): Remove this in ~M60.
+void ProcessErroneousWelcomePagePrefs(Profile* profile) {
+  const std::string kVersionErroneousWelcomeFixed = "58.0.0.0";
+  if (profile->WasCreatedByVersionOrLater(kVersionErroneousWelcomeFixed))
+    return;
+  PrefService* pref = profile->GetPrefs();
+  if (pref)

[Peter Kasting, 2017/03/28 21:42:43]

Can this conditional ever fail?  I don't know why we need this null-check.

[tmartino, 2017/03/29 20:01:05]

I was taking a conservative approach, since GetPrefs is a virtual that
technically could do all kinds of things. There seem to be lots of instances of
using this without a null-check, though, so it seems safe to remove. Done here,
and will update my other outstanding CL accordingly.

+    pref->SetBoolean(prefs::kHasSeenWelcomePage, true);
 }
 
 }  // namespace
@@ -381,7 +382,7 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
     RecordLaunchModeHistogram(urls_to_open.empty() ?
                               LM_TO_BE_DECIDED : LM_WITH_URLS);
 
-    if (UseConsolidatedFlow())
+    if (StartupBrowserCreator::UseConsolidatedFlow())
       ProcessLaunchUrlsUsingConsolidatedFlow(process_startup, urls_to_open);
     else
       ProcessLaunchURLs(process_startup, urls_to_open);
@@ -627,6 +628,8 @@ void StartupBrowserCreatorImpl::ProcessLaunchUrlsUsingConsolidatedFlow(
   if (process_startup && command_line_.HasSwitch(switches::kNoStartupWindow))
     return;
 
+  ProcessErroneousWelcomePagePrefs(profile_);
+
   StartupTabs cmd_line_tabs;
   UrlsToTabs(cmd_line_urls, &cmd_line_tabs);