Revert of Enabling kUseConsolidatedStartupFlow by default on trunk.

chrome/browser/ui/startup/startup_tab_provider_unittest.cc

Index: chrome/browser/ui/startup/startup_tab_provider_unittest.cc
diff --git a/chrome/browser/ui/startup/startup_tab_provider_unittest.cc b/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
index 226f0b79b04b731bf5f7473b98ca6d2f5cfdb7c9..98139b926c1e7f0731cfef7d0b4be0e938e34578 100644
--- a/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
@@ -192,36 +192,25 @@
   SessionStartupPref pref(SessionStartupPref::Type::URLS);
   pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
 
-  StartupTabs output =
-      StartupTabProviderImpl::CheckPreferencesTabPolicy(pref, false);
+  StartupTabs output = StartupTabProviderImpl::CheckPreferencesTabPolicy(pref);
 
   ASSERT_EQ(1U, output.size());
   EXPECT_EQ("www.google.com", output[0].url.host());
 }
 
-TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_WrongType) {
+TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_Negative) {
   SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
   pref_default.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
 
   StartupTabs output =
-      StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_default, false);
+      StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_default);
 
   EXPECT_TRUE(output.empty());
 
   SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
   pref_last.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
 
-  output = StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_last, false);
-
-  EXPECT_TRUE(output.empty());
-}
-
-TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_NotFirstBrowser) {
-  SessionStartupPref pref(SessionStartupPref::Type::URLS);
-  pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
-
-  StartupTabs output =
-      StartupTabProviderImpl::CheckPreferencesTabPolicy(pref, true);
+  output = StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_last);
 
   EXPECT_TRUE(output.empty());
 }