Expect two tabs in StartupSupervisedUserProfile test on Windows 10.

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index bbfb604470af57542d1bfd02f8dab3e344b8f220..a97c25a4390b1340f5a9f52240524e32d40b2e33 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -1187,8 +1187,11 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBrowserCreatorTest,
   ASSERT_TRUE(new_browser);
 
   TabStripModel* tab_strip = new_browser->tab_strip_model();
-  // There should be only one tab.
-  EXPECT_EQ(1, tab_strip->count());
+  // There should be only one tab, except on Windows 10. See crbug.com/505029.
+  if (IsWindows10OrNewer())

[msw, 2015/07/21 23:14:35]

nit: consider:
  const size_t tab_count = IsWindows10OrNewer() ? 2 : 1;
  EXPECT_EQ(tab_count, tab_strip->count());

[Will Harris, 2015/07/21 23:21:08]

Done. TabStripModel::count() returns a signed int though :(

+    EXPECT_EQ(2, tab_strip->count());
+  else
+    EXPECT_EQ(1, tab_strip->count());
 }
 
 #endif  // !defined(OS_CHROMEOS)