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

chrome/browser/ui/startup/startup_browser_creator_browsertest.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 <stddef.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 218 matching lines @@
   ASSERT_TRUE(embedded_test_server()->Start());
   std::vector<GURL> urls;
   urls.push_back(embedded_test_server()->GetURL("/title1.html"));
   urls.push_back(embedded_test_server()->GetURL("/title2.html"));
 
   Profile* profile = browser()->profile();
 
   // Do not show Welcome Page this run.
   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

[Peter Kasting, 2017/02/01 02:09:51]

Lots of places in this file, and one place in another file in this CL, have this
block.

It seems like it would be nice to do something like:

namespace {  // Or maybe in a common utility file both test files can call

// Disables the welcome pages for all |profiles|, as well as the Win 10 promo
// page (if applicable).
void DisableWelcomePages(const std::vector<Profile*>& profiles) {
  for (Profile* profile : profiles)
    profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);

#if defined(OS_WIN)
  g_browser_process->local_state()->SetBoolean(prefs::kHasSeenWin10PromoPage,
                                               true);
#endif
}

}

...

  DisableWelcomePages({profile1, profile2});

This ensures tests that want to disable welcome pages similarly disable the Win
10 promo page, and reduces code duplication as well.

[tmartino, 2017/02/01 21:04:33]

Done

+
   // Set the startup preference to open these URLs.
   SessionStartupPref pref(SessionStartupPref::URLS);
   pref.urls = urls;
   SessionStartupPref::SetStartupPref(profile, pref);
 
   // Keep the browser process running while browsers are closed.
   ScopedKeepAlive keep_alive(KeepAliveOrigin::BROWSER,
                              KeepAliveRestartOption::DISABLED);
 
   // Close the browser.
   CloseBrowserAsynchronously(browser());
 
   // Do a simple non-process-startup browser launch.
   base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
   chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
       chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
   {
     StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
     ASSERT_TRUE(launch.Launch(profile, std::vector<GURL>(), false));
   }
 
   // This should have created a new browser window.  |browser()| is still
   // around at this point, even though we've closed its window.
   Browser* new_browser = FindOneOtherBrowser(browser());
   ASSERT_TRUE(new_browser);
 
   std::vector<GURL> expected_urls(urls);
-  if (IsWindows10OrNewer())
-    expected_urls.insert(expected_urls.begin(), internals::GetWelcomePageURL());
 
   TabStripModel* tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(static_cast<int>(expected_urls.size()), tab_strip->count());
   for (size_t i = 0; i < expected_urls.size(); i++)
     EXPECT_EQ(expected_urls[i], tab_strip->GetWebContentsAt(i)->GetURL());
 
   // The two test_server tabs, despite having the same site, should be in
   // different SiteInstances.
   EXPECT_NE(
       tab_strip->GetWebContentsAt(tab_strip->count() - 2)->GetSiteInstance(),
       tab_strip->GetWebContentsAt(tab_strip->count() - 1)->GetSiteInstance());
 
-  // Test that the welcome page is not shown the second time through if it was
-  // above.
-  if (IsWindows10OrNewer()) {
-    // Close the browser opened above.
-    {
-      content::WindowedNotificationObserver observer(
-          chrome::NOTIFICATION_BROWSER_CLOSED,
-          content::Source<Browser>(new_browser));
-      new_browser->window()->Close();
-      observer.Wait();
-    }
-
-    {
-      StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
-      ASSERT_TRUE(launch.Launch(profile, std::vector<GURL>(), false));
-    }
-
-    // Find the new browser and ensure that it has only the specified URLs this
-    // time. Both the original browser created by the fixture and the one
-    // created above have been closed, so the new browser is the only one
-    // remaining.
-    new_browser = chrome::FindTabbedBrowser(profile, true);
-    ASSERT_TRUE(new_browser);
-    ASSERT_EQ(static_cast<int>(urls.size()),
-              new_browser->tab_strip_model()->count());
-  }
 }
 
 // Verify that startup URLs aren't used when the process already exists
 // and has other tabbed browser windows.  This is the common case of starting a
 // new browser.
 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
                        StartupURLsOnNewWindow) {
   // Use a couple arbitrary URLs.
   std::vector<GURL> urls;
   urls.push_back(ui_test_utils::GetTestUrl(
@@ skipping 15 matching lines @@
   {
     StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
     ASSERT_TRUE(
         launch.Launch(browser()->profile(), std::vector<GURL>(), false));
   }
 
   // This should have created a new browser window.
   Browser* new_browser = FindOneOtherBrowser(browser());
   ASSERT_TRUE(new_browser);
 
-  if (IsWindows10OrNewer()) {
-    // The new browser should have two tabs (not the startup URLs).
-    ASSERT_EQ(2, new_browser->tab_strip_model()->count());
-  } else {
-    // The new browser should have exactly one tab (not the startup URLs).
-    ASSERT_EQ(1, new_browser->tab_strip_model()->count());
-  }
+  // The new browser should have exactly one tab (not the startup URLs).
+  ASSERT_EQ(1, new_browser->tab_strip_model()->count());
 
   // Test that the welcome page is not shown the second time through if it was
   // above.
   if (!IsWindows10OrNewer()) {
     // Close the browser opened above.
     {
       content::WindowedNotificationObserver observer(
           chrome::NOTIFICATION_BROWSER_CLOSED,
           content::Source<Browser>(new_browser));
       new_browser->window()->Close();
@@ skipping 157 matching lines @@
   pref1.urls = urls1;
   SessionStartupPref::SetStartupPref(default_profile, pref1);
   SessionStartupPref pref2(SessionStartupPref::URLS);
   pref2.urls = urls2;
   SessionStartupPref::SetStartupPref(other_profile, pref2);
 
   // Do not show the Welcome Page for either profile.
   default_profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
   other_profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
 
+#if defined(OS_WIN)
+  // Do not show the Windows 10 promo page for any profile.
+  g_browser_process->local_state()->SetBoolean(
+      prefs::kHasSeenWin10PromoPage, true);
+#endif
+
   // Close the browser.
   CloseBrowserAsynchronously(browser());
 
   // Do a simple non-process-startup browser launch.
   base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
 
   StartupBrowserCreator browser_creator;
   std::vector<Profile*> last_opened_profiles;
   last_opened_profiles.push_back(default_profile);
   last_opened_profiles.push_back(other_profile);
   browser_creator.Start(dummy, profile_manager->user_data_dir(),
                         default_profile, last_opened_profiles);
 
   // urls1 were opened in a browser for default_profile, and urls2 were opened
   // in a browser for other_profile.
   Browser* new_browser = NULL;
   // |browser()| is still around at this point, even though we've closed its
   // window. Thus the browser count for default_profile is 2.
   ASSERT_EQ(2u, chrome::GetBrowserCount(default_profile));
   new_browser = FindOneOtherBrowserForProfile(default_profile, browser());
   ASSERT_TRUE(new_browser);
   TabStripModel* tab_strip = new_browser->tab_strip_model();
-  if (IsWindows10OrNewer()) {
-    // The new browser should have the welcome tab and the URL for the profile.
-    ASSERT_EQ(2, tab_strip->count());
-    EXPECT_EQ(GURL(internals::GetWelcomePageURL()),
-              tab_strip->GetWebContentsAt(0)->GetURL());
-    EXPECT_EQ(urls1[0], tab_strip->GetWebContentsAt(1)->GetURL());
-  } else {
-    // The new browser should have only the desired URL for the profile.
-    ASSERT_EQ(1, tab_strip->count());
-    EXPECT_EQ(urls1[0], tab_strip->GetWebContentsAt(0)->GetURL());
-  }
+
+  // The new browser should have only the desired URL for the profile.
+  ASSERT_EQ(1, tab_strip->count());
+  EXPECT_EQ(urls1[0], tab_strip->GetWebContentsAt(0)->GetURL());
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(other_profile));
   new_browser = FindOneOtherBrowserForProfile(other_profile, NULL);
   ASSERT_TRUE(new_browser);
   tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
   EXPECT_EQ(urls2[0], tab_strip->GetWebContentsAt(0)->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) {
@@ skipping 132 matching lines @@
   ASSERT_TRUE(profile_last);
   Profile* profile_urls = profile_manager->GetProfile(dest_path4);
   ASSERT_TRUE(profile_urls);
 
   // Avoid showing the Welcome page on all four profiles.
   profile_home1->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
   profile_home2->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
   profile_last->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
   profile_urls->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
 
+#if defined(OS_WIN)
+  // Do not show the Windows 10 promo page for any profile.
+  g_browser_process->local_state()->SetBoolean(
+      prefs::kHasSeenWin10PromoPage, true);
+#endif
+
   // Set the profiles to open urls, open last visited pages or display the home
   // page.
   SessionStartupPref pref_home(SessionStartupPref::DEFAULT);
   SessionStartupPref::SetStartupPref(profile_home1, pref_home);
   SessionStartupPref::SetStartupPref(profile_home2, pref_home);
 
   SessionStartupPref pref_last(SessionStartupPref::LAST);
   SessionStartupPref::SetStartupPref(profile_last, pref_last);
 
   std::vector<GURL> urls;
@@ skipping 36 matching lines @@
     base::RunLoop().RunUntilIdle();
 
   Browser* new_browser = NULL;
   // The last open profile (the profile_home1 in this case) will always be
   // launched, even if it will open just the NTP (and the welcome page on
   // relevant platforms).
   ASSERT_EQ(1u, chrome::GetBrowserCount(profile_home1));
   new_browser = FindOneOtherBrowserForProfile(profile_home1, NULL);
   ASSERT_TRUE(new_browser);
   TabStripModel* tab_strip = new_browser->tab_strip_model();
-  if (IsWindows10OrNewer()) {
-    // The new browser should have the welcome tab and the NTP.
-    ASSERT_EQ(2, tab_strip->count());
-    EXPECT_EQ(GURL(internals::GetWelcomePageURL()),
-              tab_strip->GetWebContentsAt(0)->GetURL());
-    EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-              tab_strip->GetWebContentsAt(1)->GetURL());
-  } else {
-    // The new browser should have only the NTP.
-    ASSERT_EQ(1, tab_strip->count());
-    EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-              tab_strip->GetWebContentsAt(0)->GetURL());
-  }
+
+  // The new browser should have only the NTP.
+  ASSERT_EQ(1, tab_strip->count());
+  EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
+            tab_strip->GetWebContentsAt(0)->GetURL());
 
   // profile_urls opened the urls.
   ASSERT_EQ(1u, chrome::GetBrowserCount(profile_urls));
   new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL);
   ASSERT_TRUE(new_browser);
   tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
   EXPECT_EQ(urls[0], tab_strip->GetWebContentsAt(0)->GetURL());
 
   // profile_last opened the last open pages.
@@ skipping 83 matching lines @@
   EXPECT_FALSE(SessionRestore::IsRestoring(profile_last));
   EXPECT_FALSE(SessionRestore::IsRestoring(profile_urls));
 
   // The profile which normally opens the home page displays the new tab page.
   // The welcome page is also shown for relevant platforms.
   Browser* new_browser = NULL;
   ASSERT_EQ(1u, chrome::GetBrowserCount(profile_home));
   new_browser = FindOneOtherBrowserForProfile(profile_home, NULL);
   ASSERT_TRUE(new_browser);
   TabStripModel* tab_strip = new_browser->tab_strip_model();
-  if (IsWindows10OrNewer()) {
-    // The new browser should have the welcome tab and the NTP.
-    ASSERT_EQ(2, tab_strip->count());
-    EXPECT_EQ(GURL(internals::GetWelcomePageURL()),
-              tab_strip->GetWebContentsAt(0)->GetURL());
-    EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-              tab_strip->GetWebContentsAt(1)->GetURL());
-  } else {
-    // The new browser should have only the NTP.
-    ASSERT_EQ(1, tab_strip->count());
-    EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-              tab_strip->GetWebContentsAt(0)->GetURL());
-  }
+
+  // The new browser should have only the NTP.
+  ASSERT_EQ(1, tab_strip->count());
+  EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
+            tab_strip->GetWebContentsAt(0)->GetURL());
+
   EnsureRestoreUIWasShown(tab_strip->GetWebContentsAt(0));
 
   // The profile which normally opens last open pages displays the new tab page.
   ASSERT_EQ(1u, chrome::GetBrowserCount(profile_last));
   new_browser = FindOneOtherBrowserForProfile(profile_last, NULL);
   ASSERT_TRUE(new_browser);
   tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
             tab_strip->GetWebContentsAt(0)->GetURL());
@@ skipping 35 matching lines @@
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false));
 
   // This should have created a new browser window.
   Browser* new_browser = FindOneOtherBrowser(browser());
   ASSERT_TRUE(new_browser);
 
   TabStripModel* tab_strip = new_browser->tab_strip_model();
-  // There should be only one tab, except on Windows 10. See crbug.com/505029.
-  const int tab_count = IsWindows10OrNewer() ? 2 : 1;
-  EXPECT_EQ(tab_count, tab_strip->count());
+
+  EXPECT_EQ(1, tab_strip->count());
 }
 
 #endif  // !defined(OS_CHROMEOS)
 
 // These tests are not applicable to Chrome OS as neither master_preferences nor
 // the sync promo exist there.
 #if !defined(OS_CHROMEOS)
 
 class StartupBrowserCreatorFirstRunTest : public InProcessBrowserTest {
  protected:
@@ skipping 156 matching lines @@
   ASSERT_TRUE(new_browser);
 
   // Verify that the first-run tab is shown and no other pages are present.
   TabStripModel* tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
   EXPECT_EQ("title1.html",
             tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());
 }
 
 #endif  // !defined(OS_CHROMEOS)