| Index: content/network/url_loader_unittest.cc
|
| diff --git a/content/network/url_loader_unittest.cc b/content/network/url_loader_unittest.cc
|
| index 69af3fd82592f1bd4aaad698fa1c5ec380acdc00..e79180824932a11fb1bef3a53972768918f8b10a 100644
|
| --- a/content/network/url_loader_unittest.cc
|
| +++ b/content/network/url_loader_unittest.cc
|
| @@ -44,8 +44,13 @@ static ResourceRequest CreateResourceRequest(const char* method,
|
| }
|
|
|
| std::string ReadData(MojoHandle consumer, size_t size) {
|
| - CHECK_EQ(mojo::Wait(mojo::Handle(consumer), MOJO_HANDLE_SIGNAL_READABLE),
|
| - MOJO_RESULT_OK);
|
| + MojoResult rv =
|
| + mojo::Wait(mojo::Handle(consumer), MOJO_HANDLE_SIGNAL_READABLE);
|
| + if (!size) {
|
| + CHECK_EQ(rv, MOJO_RESULT_FAILED_PRECONDITION);
|
| + return std::string();
|
| + }
|
| + CHECK_EQ(rv, MOJO_RESULT_OK);
|
| std::vector<char> buffer(size);
|
| uint32_t num_bytes = static_cast<uint32_t>(size);
|
| CHECK_EQ(MojoReadData(consumer, buffer.data(), &num_bytes,
|
| @@ -116,6 +121,10 @@ TEST_F(URLLoaderImplTest, Basic) {
|
| LoadAndCompareFile("simple_page.html");
|
| }
|
|
|
| +TEST_F(URLLoaderImplTest, Empty) {
|
| + LoadAndCompareFile("empty.html");
|
| +}
|
| +
|
| TEST_F(URLLoaderImplTest, BasicSSL) {
|
| net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
|
| https_server.ServeFilesFromSourceDirectory(
|
|
|