chrome/browser/prerender/prerender_browsertest.cc - Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

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/prerender/prerender_browsertest.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/notifications/notification_browsertest.cc ('k') | chrome/browser/search_engines/template_url_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prerender/prerender_browsertest.cc

diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc

index 8521d351209e1787cdd8052902df41b112881695..4a2f70e6eb04964c7e3dca5617313ffa88ab9c32 100644

--- a/chrome/browser/prerender/prerender_browsertest.cc

+++ b/chrome/browser/prerender/prerender_browsertest.cc

@@ -2737,11 +2737,6 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,

class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,

public ExtensionApiTest {

public:

- PrerenderBrowserTestWithExtensions() {

- autostart_test_server_ = false;

- }

- virtual ~PrerenderBrowserTestWithExtensions() {}

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

PrerenderBrowserTest::SetUpCommandLine(command_line);

ExtensionApiTest::SetUpCommandLine(command_line);

@@ -2765,7 +2760,7 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,

// http://crbug.com/177163

IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions,

DISABLED_WebNavigation) {

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

extensions::FrameNavigationState::set_allow_extension_scheme(true);

CommandLine::ForCurrentProcess()->AppendSwitch(

@@ -2796,7 +2791,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions,

#define MAYBE_TabsApi TabsApi

#endif // defined(OS_WIN)

IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, MAYBE_TabsApi) {

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

extensions::FrameNavigationState::set_allow_extension_scheme(true);

// Wait for the extension to set itself up and return control to us.