Enabling kUseConsolidatedStartupFlow by default on trunk.

chrome/browser/ui/startup/startup_tab_provider.h

Index: chrome/browser/ui/startup/startup_tab_provider.h
diff --git a/chrome/browser/ui/startup/startup_tab_provider.h b/chrome/browser/ui/startup/startup_tab_provider.h
index 582509e1bb2cfbdfc2111e2b9cb381edf93bfe9e..633ee02b172020b08c15d27135b81c7f5c1e23df 100644
--- a/chrome/browser/ui/startup/startup_tab_provider.h
+++ b/chrome/browser/ui/startup/startup_tab_provider.h
@@ -91,10 +91,12 @@ class StartupTabProviderImpl : public StartupTabProvider {
   static StartupTabs CheckPinnedTabPolicy(const SessionStartupPref& pref,
                                           const StartupTabs& pinned_tabs);
 
-  // Determines whether preferences indicate that user-specified tabs should be
-  // shown as the default new window content, and returns the specified tabs if
-  // so.
-  static StartupTabs CheckPreferencesTabPolicy(const SessionStartupPref& pref);
+  // Determines whether preferences and window state indicate that
+  // user-specified tabs should be shown as the default new window content, and
+  // returns the specified tabs if so.
+  static StartupTabs CheckPreferencesTabPolicy(
+      const SessionStartupPref& pref,
+      bool profile_has_other_tabbed_browser);
 
   // Determines whether startup preferences require the New Tab Page to be
   // explicitly specified. Session Restore does not expect the NTP to be passed.