chrome/browser/chromeos/login/oobe_browsertest.cc - Issue 15740023: Revert "Revert 202112 "GTTF: Convert most tests in content to use Embedd...""

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/oobe_browsertest.cc

Issue 15740023: Revert "Revert 202112 "GTTF: Convert most tests in content to use Embedd..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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/contacts/gdata_contacts_service_unittest.cc ('k') | chrome/browser/extensions/api/streams_private/streams_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d52a391a3de67c2405d7927849fdf0a39eab7203..3ecab68a86f0dff938af5eb8f02efa5345197b16 100644

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

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

@@ -175,7 +175,7 @@ class OobeTest : public chromeos::CrosInProcessBrowserTest {

GURL url = test_server_->GetURL(request.relative_url);

LOG(INFO) << "Http request: " << url.spec();

- scoped_ptr<HttpResponse> http_response(new HttpResponse());

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

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

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

http_response->set_content(service_login_response_);

@@ -197,7 +197,7 @@ class OobeTest : public chromeos::CrosInProcessBrowserTest {

} else {

NOTREACHED() << url.path();

}

- return http_response.Pass();

+ return http_response.PassAs<HttpResponse>();

}

scoped_ptr<TestContentBrowserClient> content_browser_client_;