Commit af50fda8 authored by robertshield's avatar robertshield Committed by Commit bot

Fix StartupBrowserCreatorTriggeredResetTest.TestTriggeredResetDoesNotShowWithFirstRunURLs

in official builds.

Expect the first tab to be the signin page during browser tests run for an official build.

BUG=536730
TEST=browser_Tests.exe --gtest_filter=*StartupBrowserCreatorTriggeredResetTest*
TBR=msw

Review URL: https://codereview.chromium.org/1369323002

Cr-Commit-Position: refs/heads/master@{#351083}
parent 28ac7440
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/profile_resetter/triggered_profile_resetter.h" #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
#include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.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.h"
#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_iterator.h"
...@@ -153,8 +154,15 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest, ...@@ -153,8 +154,15 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
// Verify that only the first-run tabs are shown. // Verify that only the first-run tabs are shown.
TabStripModel* tab_strip = new_browser->tab_strip_model(); TabStripModel* tab_strip = new_browser->tab_strip_model();
ASSERT_EQ(2, tab_strip->count()); 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),
tab_strip->GetWebContentsAt(0)->GetURL());
} else {
EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
tab_strip->GetWebContentsAt(0)->GetURL());
}
EXPECT_EQ("title1.html", EXPECT_EQ("title1.html",
tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName()); tab_strip->GetWebContentsAt(1)->GetURL().ExtractFileName());
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment