Moving new First Run to use per-profile value, rather than simply checking IsChromeFirstRun.

chrome/browser/ui/startup/startup_tab_provider_unittest.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/strings/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy) {
-  StartupTabs output =
-      StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(true);
+  // Show welcome page to new unauthenticated profile on first run.
+  StartupTabs output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
+      true, false, false);
 
   ASSERT_EQ(1U, output.size());
-  EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(), output[0].url);
+  EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url);
+  EXPECT_FALSE(output[0].is_pinned);
+
+  // After first run, display welcome page using variant view.
+  output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
+      false, false, false);
+
+  ASSERT_EQ(1U, output.size());
+  EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(true), output[0].url);
   EXPECT_FALSE(output[0].is_pinned);
 }
 
-TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy_FirstRunOnly) {
-  StartupTabs output =
-      StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(false);
+TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy_Negative) {
+  // Do not show the welcome page to the same profile twice.
+  StartupTabs output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
+      true, true, false);
+
+  EXPECT_TRUE(output.empty());
+
+  // Do not show the welcome page to authenticated users.
+  output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(true, false,
+                                                                    true);
 
   EXPECT_TRUE(output.empty());
 }
 
 TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy) {
   std::vector<GURL> input = {GURL(base::ASCIIToUTF16("https://new_tab_page")),
                              GURL(base::ASCIIToUTF16("https://www.google.com")),
                              GURL(base::ASCIIToUTF16("https://welcome_page"))};
 
   StartupTabs output =
       StartupTabProviderImpl::CheckMasterPrefsTabPolicy(true, input);
 
   ASSERT_EQ(3U, output.size());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
   EXPECT_FALSE(output[0].is_pinned);
   EXPECT_EQ(input[1], output[1].url);
   EXPECT_FALSE(output[1].is_pinned);
-  EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(), output[2].url);
+  EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[2].url);
   EXPECT_FALSE(output[2].is_pinned);
 }
 
 TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy_FirstRunOnly) {
   std::vector<GURL> input = {
       GURL(base::ASCIIToUTF16("https://www.google.com"))};
 
   StartupTabs output =
       StartupTabProviderImpl::CheckMasterPrefsTabPolicy(false, input);
 
@@ skipping 87 matching lines @@
 }
 
 TEST(StartupTabProviderTest, CheckNewTabPageTabPolicy_Negative) {
   SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
 
   StartupTabs output =
       StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_last);
 
   ASSERT_TRUE(output.empty());
 }