Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1277)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets
Patch Set: Rebase. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c92e8b04b22c5dd7a891bc6749cd11d2de2c2c66..388b4a552e3cf1300c0a1171241cb375a2cecfff 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
@@ -87,10 +87,10 @@ class StartupBrowserCreatorTriggeredResetTest : public InProcessBrowserTest {
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
TestTriggeredReset) {
// Use a couple same-site HTTP URLs.
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
std::vector<GURL> urls;
- urls.push_back(test_server()->GetURL("files/title1.html"));
- urls.push_back(test_server()->GetURL("files/title2.html"));
+ urls.push_back(embedded_test_server()->GetURL("/title1.html"));
+ urls.push_back(embedded_test_server()->GetURL("/title2.html"));
Profile* profile = browser()->profile();
chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
@@ -137,9 +137,11 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
// The presence of First Run tabs (in production code, these commonly come
// from master_preferences) should suppress the reset UI. Check that this is
// the case.
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
browser_creator.AddFirstRunTab(GURL("http://new_tab_page"));
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
// Do a process-startup browser launch.
base::CommandLine dummy(base::CommandLine::NO_PROGRAM);

Powered by Google App Engine
This is Rietveld 408576698