| 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 9da982c580c4b5d28fcb66c1d13359d2cb1c6ed4..6a1df6e20cd5271134a9038fb2178d9918f28206 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
|
| +++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
|
| @@ -95,10 +95,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.PassAs<HttpResponse>();
|
| + return http_response.Pass();
|
| }
|
|
|
| - return scoped_ptr<HttpResponse>();
|
| + return nullptr;
|
| }
|
|
|
| protected:
|
|
|