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

Unified Diff: net/test/embedded_test_server/embedded_test_server_unittest.cc

Issue 15505003: GTTF: Convert most tests in content to use EmbeddedTestServer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes 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
Index: net/test/embedded_test_server/embedded_test_server_unittest.cc
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
index 1993ef0f931a746c7a409e4d9757b8e060ded560..e78cd47e2a38b4cf3c70197bdb2fc8f8c31d24b2 100644
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -82,11 +82,12 @@ class EmbeddedTestServerTest : public testing::Test,
// Handles |request| sent to |path| and returns the response per |content|,
// |content type|, and |code|. Saves the request URL for verification.
- scoped_ptr<HttpResponse> HandleRequest(const std::string& path,
- const std::string& content,
- const std::string& content_type,
- ResponseCode code,
- const HttpRequest& request) {
+ scoped_ptr<HttpResponseInterface> HandleRequest(
+ const std::string& path,
+ const std::string& content,
+ const std::string& content_type,
+ ResponseCode code,
+ const HttpRequest& request) {
request_relative_url_ = request.relative_url;
GURL absolute_url = server_->GetURL(request.relative_url);
@@ -95,10 +96,10 @@ class EmbeddedTestServerTest : public testing::Test,
http_response->set_code(code);
http_response->set_content(content);
http_response->set_content_type(content_type);
- return http_response.Pass();
+ return http_response.PassAs<HttpResponseInterface>();
}
- return scoped_ptr<HttpResponse>();
+ return scoped_ptr<HttpResponseInterface>();
}
protected:

Powered by Google App Engine
This is Rietveld 408576698