Make ByteStream independent from DownloadInterruptReason

content/browser/byte_stream_unittest.cc

Index: content/browser/byte_stream_unittest.cc
diff --git a/content/browser/byte_stream_unittest.cc b/content/browser/byte_stream_unittest.cc
index a585fb7a6c2f3ddda09bbc4c973b2f890e6b2773..925467c06ae762fb094430320311faabf14d9a06 100644
--- a/content/browser/byte_stream_unittest.cc
+++ b/content/browser/byte_stream_unittest.cc
@@ -115,7 +115,7 @@ TEST_F(ByteStreamTest, ByteStream_PushBack) {
   EXPECT_FALSE(Write(byte_stream_input.get(), 1));
   EXPECT_FALSE(Write(byte_stream_input.get(), 1024));
   // Flush
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
+  byte_stream_input->Close(0);
   message_loop_.RunUntilIdle();
 
   // Pull the IO buffers out; do we get the same buffers and do they
@@ -178,7 +178,7 @@ TEST_F(ByteStreamTest, ByteStream_Flush) {
   EXPECT_EQ(ByteStreamReader::STREAM_EMPTY,
             byte_stream_output->Read(&output_io_buffer, &output_length));
 
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
+  byte_stream_input->Close(0);
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(ByteStreamReader::STREAM_COMPLETE,
@@ -251,12 +251,11 @@ TEST_F(ByteStreamTest, ByteStream_CompleteTransmits) {
       3 * 1024, &byte_stream_input, &byte_stream_output);
   EXPECT_EQ(ByteStreamReader::STREAM_EMPTY,
             byte_stream_output->Read(&output_io_buffer, &output_length));
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
+  byte_stream_input->Close(0);
   message_loop_.RunUntilIdle();
   ASSERT_EQ(ByteStreamReader::STREAM_COMPLETE,
             byte_stream_output->Read(&output_io_buffer, &output_length));
-  EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE,
-            byte_stream_output->GetStatus());
+  EXPECT_EQ(0, byte_stream_output->GetStatus());
 
   // Non-empty stream, non-error case.
   CreateByteStream(
@@ -265,45 +264,44 @@ TEST_F(ByteStreamTest, ByteStream_CompleteTransmits) {
   EXPECT_EQ(ByteStreamReader::STREAM_EMPTY,
             byte_stream_output->Read(&output_io_buffer, &output_length));
   EXPECT_TRUE(Write(byte_stream_input.get(), 1024));
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
+  byte_stream_input->Close(0);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(ByteStreamReader::STREAM_HAS_DATA,
             byte_stream_output->Read(&output_io_buffer, &output_length));
   EXPECT_TRUE(ValidateIOBuffer(output_io_buffer, output_length));
   ASSERT_EQ(ByteStreamReader::STREAM_COMPLETE,
             byte_stream_output->Read(&output_io_buffer, &output_length));
-  EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE,
-            byte_stream_output->GetStatus());
+  EXPECT_EQ(0, byte_stream_output->GetStatus());
 
-  // Empty stream, non-error case.
+  const int kFakeErrorCode = 22;
+
+  // Empty stream, error case.
   CreateByteStream(
       message_loop_.message_loop_proxy(), message_loop_.message_loop_proxy(),
       3 * 1024, &byte_stream_input, &byte_stream_output);
   EXPECT_EQ(ByteStreamReader::STREAM_EMPTY,
             byte_stream_output->Read(&output_io_buffer, &output_length));
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED);
+  byte_stream_input->Close(kFakeErrorCode);
   message_loop_.RunUntilIdle();
   ASSERT_EQ(ByteStreamReader::STREAM_COMPLETE,
             byte_stream_output->Read(&output_io_buffer, &output_length));
-  EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED,
-            byte_stream_output->GetStatus());
+  EXPECT_EQ(kFakeErrorCode, byte_stream_output->GetStatus());
 
-  // Non-empty stream, non-error case.
+  // Non-empty stream, error case.
   CreateByteStream(
       message_loop_.message_loop_proxy(), message_loop_.message_loop_proxy(),
       3 * 1024, &byte_stream_input, &byte_stream_output);
   EXPECT_EQ(ByteStreamReader::STREAM_EMPTY,
             byte_stream_output->Read(&output_io_buffer, &output_length));
   EXPECT_TRUE(Write(byte_stream_input.get(), 1024));
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED);
+  byte_stream_input->Close(kFakeErrorCode);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(ByteStreamReader::STREAM_HAS_DATA,
             byte_stream_output->Read(&output_io_buffer, &output_length));
   EXPECT_TRUE(ValidateIOBuffer(output_io_buffer, output_length));
   ASSERT_EQ(ByteStreamReader::STREAM_COMPLETE,
             byte_stream_output->Read(&output_io_buffer, &output_length));
-  EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED,
-            byte_stream_output->GetStatus());
+  EXPECT_EQ(kFakeErrorCode, byte_stream_output->GetStatus());
 }
 
 // Confirm that callbacks on the sink side are triggered when they should be.
@@ -538,7 +536,7 @@ TEST_F(ByteStreamTest, ByteStream_ZeroCallback) {
       base::Bind(CountCallbacks, &num_callbacks));
 
   // Immediately close the stream.
-  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
+  byte_stream_input->Close(0);
   task_runner->RunUntilIdle();
   EXPECT_EQ(1, num_callbacks);
 }