Add Flush() method to ByteStream.

content/browser/byte_stream_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/byte_stream.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 128 matching lines @@
   EXPECT_TRUE(ValidateIOBuffer(output_io_buffer, output_length));
 
   EXPECT_EQ(ByteStreamReader::STREAM_HAS_DATA,
             byte_stream_output->Read(&output_io_buffer, &output_length));
   EXPECT_TRUE(ValidateIOBuffer(output_io_buffer, output_length));
 
   EXPECT_EQ(ByteStreamReader::STREAM_COMPLETE,
             byte_stream_output->Read(&output_io_buffer, &output_length));
 }
 
+// Confirm that Flush() method makes the writer to send written contents to
+// the reader.
+TEST_F(ByteStreamTest, ByteStream_Flush) {
+  scoped_ptr<ByteStreamWriter> byte_stream_input;
+  scoped_ptr<ByteStreamReader> byte_stream_output;
+  CreateByteStream(
+      message_loop_.message_loop_proxy(), message_loop_.message_loop_proxy(),
+      1024, &byte_stream_input, &byte_stream_output);
+
+  EXPECT_TRUE(Write(byte_stream_input.get(), 1));
+  byte_stream_input->Flush();

[Randy Smith (Not in Mondays), 2013/07/18 16:11:44]

nit: I'd like there to be part of this test that confirms that the data
*doesn't* get there until you flush, i.e. that the difference between
before/after flush is the absence/presence of data.

[tyoshino (SeeGerritForStatus), 2013/07/25 05:13:38]

Added expectation.

+  message_loop_.RunUntilIdle();
+
+  scoped_refptr<net::IOBuffer> output_io_buffer;
+  size_t output_length;
+  EXPECT_EQ(ByteStreamReader::STREAM_HAS_DATA,
+            byte_stream_output->Read(&output_io_buffer, &output_length));
+  EXPECT_TRUE(ValidateIOBuffer(output_io_buffer, output_length));
+
+  // Check that it's ok to Flush() an empty writer.
+  byte_stream_input->Flush();
+  message_loop_.RunUntilIdle();
+
+  EXPECT_EQ(ByteStreamReader::STREAM_EMPTY,
+            byte_stream_output->Read(&output_io_buffer, &output_length));
+
+  byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
+  message_loop_.RunUntilIdle();
+
+  EXPECT_EQ(ByteStreamReader::STREAM_COMPLETE,
+            byte_stream_output->Read(&output_io_buffer, &output_length));
+}
+
 // Same as above, only use knowledge of the internals to confirm
 // that we're getting pushback even when data's split across the two
 // objects
 TEST_F(ByteStreamTest, ByteStream_PushBackSplit) {
   scoped_ptr<ByteStreamWriter> byte_stream_input;
   scoped_ptr<ByteStreamReader> byte_stream_output;
   CreateByteStream(
       message_loop_.message_loop_proxy(), message_loop_.message_loop_proxy(),
       9 * 1024, &byte_stream_input, &byte_stream_output);
 
@@ skipping 339 matching lines @@
   byte_stream_output->RegisterCallback(
       base::Bind(CountCallbacks, &num_callbacks));
 
   // Immediately close the stream.
   byte_stream_input->Close(DOWNLOAD_INTERRUPT_REASON_NONE);
   task_runner->RunUntilIdle();
   EXPECT_EQ(1, num_callbacks);
 }
 
 }  // namespace content