Fix StartupBrowserCreatorTriggeredResetTest.TestTriggeredResetDoesNotShowWithFirstRunURLs

chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

Index: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
index 099bf731e46154e8216e648929ee82eb462d4946..e872c3f894a84cac6b507ba7680fb92ecfd5c266 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
+#include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
@@ -153,8 +154,15 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
   // Verify that only the first-run tabs are shown.
   TabStripModel* tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(2, tab_strip->count());
-  EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-            tab_strip->GetWebContentsAt(0)->GetURL());
+
+  if (signin::ShouldShowPromoAtStartup(browser()->profile(), true)) {
+    EXPECT_EQ(signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),

[msw, 2015/09/28 18:19:43]

optional nit for optional follow up refactoring :)
  GURL expected_url = signin::ShouldShowPromoAtStartup(browser()->profile(),
true) ? signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false) :
GURL(chrome::kChromeUINewTabURL);
  EXPECT_EQ(expected_url, tab_strip->GetWebContentsAt(0)->GetURL());

+              tab_strip->GetWebContentsAt(0)->GetURL());
+  } else {
+    EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
+              tab_strip->GetWebContentsAt(0)->GetURL());
+  }
+
   EXPECT_EQ("title1.html",
             tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName());
 }