chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_browsertest.cc ('k') | chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..49ada97c7cfcbdff0398fd7f9fbe3b259868e7c0 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

@@ -20,6 +20,7 @@

#include "chrome/common/url_constants.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

+#include "net/test/embedded_test_server/embedded_test_server.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace {

@@ -87,10 +88,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 +138,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);