| Index: chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| index e24ef5e37e90c5d4c48df65a788f3df0b8691f72..36e06cc69294d3ab2e1d40cbfb83d9bf25f8ef1d 100644
|
| --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| @@ -35,6 +35,7 @@ using content::ResourceController;
|
| using content::WebContents;
|
| using extensions::Event;
|
| using extensions::ExtensionSystem;
|
| +using net::test_server::BasicHttpResponse;
|
| using net::test_server::HttpRequest;
|
| using net::test_server::HttpResponse;
|
| using net::test_server::EmbeddedTestServer;
|
| @@ -45,14 +46,14 @@ namespace {
|
| // Test server's request handler.
|
| // Returns response that should be sent by the test server.
|
| scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
|
| - scoped_ptr<HttpResponse> response(new HttpResponse());
|
| + scoped_ptr<BasicHttpResponse> response(new BasicHttpResponse());
|
|
|
| // For relative path "/doc_path.doc", return success response with MIME type
|
| // "application/msword".
|
| if (request.relative_url == "/doc_path.doc") {
|
| response->set_code(net::test_server::SUCCESS);
|
| response->set_content_type("application/msword");
|
| - return response.Pass();
|
| + return response.PassAs<HttpResponse>();
|
| }
|
|
|
| // For relative path "/test_path_attch.txt", return success response with
|
| @@ -64,7 +65,7 @@ scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
|
| response->set_content_type("plain/text");
|
| response->AddCustomHeader("Content-Disposition",
|
| "attachment; filename=test_path.txt");
|
| - return response.Pass();
|
| + return response.PassAs<HttpResponse>();
|
| }
|
| // For relative path "/test_path_attch.txt", return success response with
|
| // MIME type "plain/text" and content "txt content".
|
| @@ -72,13 +73,13 @@ scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
|
| response->set_code(net::test_server::SUCCESS);
|
| response->set_content("txt content");
|
| response->set_content_type("plain/text");
|
| - return response.Pass();
|
| + return response.PassAs<HttpResponse>();
|
| }
|
|
|
| // No other requests should be handled in the tests.
|
| EXPECT_TRUE(false) << "NOTREACHED!";
|
| response->set_code(net::test_server::NOT_FOUND);
|
| - return response.Pass();
|
| + return response.PassAs<HttpResponse>();
|
| }
|
|
|
| // Tests to verify that resources are correctly intercepted by
|
|
|