Reland: URLRequestJob: change ReadRawData contract

net/url_request/url_request_job_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_job.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_transaction_test_util.h"
@@ skipping 58 matching lines @@
     base::Time(),
     "hello",
     TEST_MODE_NORMAL,
     nullptr,
     nullptr,
     0,
     0,
     OK,
 };
 
+const MockTransaction kEmptyBody_Transaction = {

[mmenke, 2015/11/17 18:57:32]

Maybe kEmptyBodyGzip_Transaction?

[xunjieli, 2015/11/17 20:28:35]

Done.

+    "http://www.google.com/empty_body",
+    "GET",
+    base::Time(),
+    "",
+    LOAD_NORMAL,
+    "HTTP/1.1 200 OK",
+    "Content-Encoding: gzip\n",
+    base::Time(),
+    "",
+    TEST_MODE_NORMAL,
+    nullptr,
+    nullptr,
+    0,
+    0,
+    OK,
+};
+
 }  // namespace
 
 TEST(URLRequestJob, TransactionNotifiedWhenDone) {
   MockNetworkLayer network_layer;
   TestURLRequestContext context;
   context.set_http_transaction_factory(&network_layer);
 
   TestDelegate d;
   scoped_ptr<URLRequest> req(
       context.CreateRequest(GURL(kGZip_Transaction.url), DEFAULT_PRIORITY, &d));
@@ skipping 91 matching lines @@
   req->set_method("GET");
   req->Start();
 
   base::RunLoop().Run();
 
   EXPECT_TRUE(network_layer.stop_caching_called());
 
   RemoveMockTransaction(&kGZip_Transaction);
 }
 
+// Makes sure that ReadRawDataComplete correctly updates request status before
+// calling ReadFilteredData.
+// Regression test for crbug.com/553300.
+TEST(URLRequestJob, EmptyBodySkipFilter) {
+  MockNetworkLayer network_layer;
+  TestURLRequestContext context;
+  context.set_http_transaction_factory(&network_layer);
+
+  TestDelegate d;
+  scoped_ptr<URLRequest> req(context.CreateRequest(
+      GURL(kEmptyBody_Transaction.url), DEFAULT_PRIORITY, &d));
+  AddMockTransaction(&kEmptyBody_Transaction);
+
+  req->set_method("GET");
+  req->Start();
+
+  base::MessageLoop::current()->Run();
+
+  EXPECT_FALSE(d.request_failed());
+  EXPECT_EQ(200, req->GetResponseCode());
+  EXPECT_TRUE(d.data_received().empty());
+  EXPECT_TRUE(network_layer.done_reading_called());
+
+  RemoveMockTransaction(&kEmptyBody_Transaction);
+}
+
 }  // namespace net