Fix stream errors that occur after a stream starts not propagating.

content/browser/streams/stream_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 "content/browser/streams/stream_url_request_job.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 50 matching lines @@
 
     url_request_job_factory_.SetProtocolHandler(
         "blob", base::MakeUnique<MockProtocolHandler>(registry_.get()));
     url_request_context_.set_job_factory(&url_request_job_factory_);
   }
 
   void TearDown() override {}
 
   void TestSuccessRequest(const GURL& url,
                           const std::string& expected_response) {
-    TestRequest("GET", url, net::HttpRequestHeaders(), 200, expected_response);
+    TestRequest("GET", url, net::HttpRequestHeaders(), 200, net::OK,
+                expected_response);
   }
 
   void TestRequest(const std::string& method,
                    const GURL& url,
                    const net::HttpRequestHeaders& extra_headers,
                    int expected_status_code,
+                   int expected_error_code,
                    const std::string& expected_response) {
     net::TestDelegate delegate;
     request_ = url_request_context_.CreateRequest(
         url, net::DEFAULT_PRIORITY, &delegate);
     request_->set_method(method);
     if (!extra_headers.IsEmpty())
       request_->SetExtraRequestHeaders(extra_headers);
     request_->Start();
 
     base::RunLoop().RunUntilIdle();
 
     // Verify response.
-    EXPECT_TRUE(request_->status().is_success());
+    if (expected_error_code)
+      EXPECT_EQ(expected_error_code, request_->status().error());
+    else
+      EXPECT_TRUE(request_->status().is_success());
     ASSERT_TRUE(request_->response_headers());
     EXPECT_EQ(expected_status_code,
               request_->response_headers()->response_code());
     EXPECT_EQ(expected_response, delegate.data_received());
   }
 
  protected:
   base::MessageLoopForIO message_loop_;
   std::unique_ptr<StreamRegistry> registry_;
 
   net::URLRequestContext url_request_context_;
   net::URLRequestJobFactoryImpl url_request_job_factory_;
   std::unique_ptr<net::URLRequest> request_;
 };
 
 TEST_F(StreamURLRequestJobTest, TestGetSimpleDataRequest) {
   scoped_refptr<Stream> stream(
       new Stream(registry_.get(), NULL, kStreamURL));
 
   scoped_refptr<net::StringIOBuffer> buffer(
       new net::StringIOBuffer(kTestData1));
 
   stream->AddData(buffer, buffer->size());
-  stream->Finalize();
+  stream->Finalize(net::OK);
 
   TestSuccessRequest(kStreamURL, kTestData1);
 }
 
 TEST_F(StreamURLRequestJobTest, TestGetLargeStreamRequest) {
   scoped_refptr<Stream> stream(
       new Stream(registry_.get(), NULL, kStreamURL));
 
   std::string large_data;
   large_data.reserve(kBufferSize * 5);
   for (int i = 0; i < kBufferSize * 5; ++i)
     large_data.append(1, static_cast<char>(i % 256));
 
   scoped_refptr<net::StringIOBuffer> buffer(
       new net::StringIOBuffer(large_data));
 
   stream->AddData(buffer, buffer->size());
-  stream->Finalize();
+  stream->Finalize(net::OK);
   TestSuccessRequest(kStreamURL, large_data);
 }
 
 TEST_F(StreamURLRequestJobTest, TestGetNonExistentStreamRequest) {
   net::TestDelegate delegate;
   request_ = url_request_context_.CreateRequest(
       kStreamURL, net::DEFAULT_PRIORITY, &delegate);
   request_->set_method("GET");
   request_->Start();
 
   base::RunLoop().RunUntilIdle();
 
   // Verify response.
   EXPECT_FALSE(request_->status().is_success());
 }
 
 TEST_F(StreamURLRequestJobTest, TestRangeDataRequest) {
   scoped_refptr<Stream> stream(
       new Stream(registry_.get(), NULL, kStreamURL));
 
   scoped_refptr<net::StringIOBuffer> buffer(
       new net::StringIOBuffer(kTestData2));
 
   stream->AddData(buffer, buffer->size());
-  stream->Finalize();
+  stream->Finalize(net::OK);
 
   net::HttpRequestHeaders extra_headers;
   extra_headers.SetHeader(net::HttpRequestHeaders::kRange,
                           net::HttpByteRange::Bounded(0, 3).GetHeaderValue());
   TestRequest("GET", kStreamURL, extra_headers,
-              200, std::string(kTestData2, 4));
+              200, net::OK, std::string(kTestData2, 4));
 }
 
 TEST_F(StreamURLRequestJobTest, TestInvalidRangeDataRequest) {
   scoped_refptr<Stream> stream(
       new Stream(registry_.get(), NULL, kStreamURL));
 
   scoped_refptr<net::StringIOBuffer> buffer(
       new net::StringIOBuffer(kTestData2));
 
   stream->AddData(buffer, buffer->size());
-  stream->Finalize();
+  stream->Finalize(net::OK);
 
   net::HttpRequestHeaders extra_headers;
   extra_headers.SetHeader(net::HttpRequestHeaders::kRange,
                           net::HttpByteRange::Bounded(1, 3).GetHeaderValue());
-  TestRequest("GET", kStreamURL, extra_headers, 405, std::string());
+  TestRequest("GET", kStreamURL, extra_headers, 405,
+              net::ERR_METHOD_NOT_SUPPORTED, std::string());
 }
 
 }  // namespace content