Enabling new FRE and launch flow by default on Win 10.

chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

Index: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
index 1063a26ce22e8e21795373533a440baec4579ce6..cf2554982dde13168eb27c6afab1d8a3b5e3227f 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
@@ -114,6 +114,12 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
   // Avoid showing the Welcome page.
   profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
 
+#if defined(OS_WIN)
+  // Do not show the Windows 10 promo page.
+  g_browser_process->local_state()->SetBoolean(prefs::kHasSeenWin10PromoPage,
+                                               true);
+#endif
+
   // Set the startup preference to open these URLs.
   SessionStartupPref pref(SessionStartupPref::URLS);
   pref.urls = urls;
@@ -141,8 +147,6 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
   ASSERT_TRUE(new_browser);
 
   std::vector<GURL> expected_urls(urls);
-  if (base::win::GetVersion() >= base::win::VERSION_WIN10)
-    expected_urls.insert(expected_urls.begin(), internals::GetWelcomePageURL());
   expected_urls.insert(expected_urls.begin(),
                        internals::GetTriggeredResetSettingsURL());