chrome/browser/chromeos/login/kiosk_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/chromeos/login/kiosk_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/chromeos/extensions/wallpaper_private_apitest.cc ('k') | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/kiosk_browsertest.cc

diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc

index 3998ea9d13fd1b6e2c5796872f469795864b6fb1..5f24137a75682a4c8f1faf347e17ef56f4ad1843 100644

--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc

+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -443,7 +443,7 @@ class KioskTest : public chromeos::CrosInProcessBrowserTest,

scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());

if (url.path() == "/ServiceLogin") {

- http_response->set_code(net::test_server::SUCCESS);

+ http_response->set_code(net::HTTP_OK);

http_response->set_content(service_login_response_);

http_response->set_content_type("text/html");

} else if (url.path() == "/ServiceLoginAuth") {

@@ -454,7 +454,7 @@ class KioskTest : public chromeos::CrosInProcessBrowserTest,

int continue_arg_end = request.content.find("&", continue_arg_begin);

const std::string continue_url = request.content.substr(

continue_arg_begin, continue_arg_end - continue_arg_begin);

- http_response->set_code(net::test_server::SUCCESS);

+ http_response->set_code(net::HTTP_OK);

const std::string redirect_js =

"document.location.href = unescape('" + continue_url + "');";

http_response->set_content(