[Android WebView] Make InputStreamImpl::Read fill the IOBuffer.

android_webview/native/input_stream_unittest.cc

Index: android_webview/native/input_stream_unittest.cc
diff --git a/android_webview/native/input_stream_unittest.cc b/android_webview/native/input_stream_unittest.cc
index 87b3fe33d48793533d27e15a6e7fd076238a7385..7faefb0df4041badd3da63f45f77aad4f8eaf244 100644
--- a/android_webview/native/input_stream_unittest.cc
+++ b/android_webview/native/input_stream_unittest.cc
@@ -89,10 +89,10 @@ TEST_F(InputStreamTest, ReadStreamCompletely) {
 }
 
 TEST_F(InputStreamTest, TryReadMoreThanBuffer) {
-  const int bytes_requested = 3 * InputStreamImpl::kBufferSize;
+  const int buffer_size = 3 * InputStreamImpl::kBufferSize;
   int bytes_read = 0;
-  DoReadCountedStreamTest(bytes_requested, bytes_requested, &bytes_read);
-  EXPECT_EQ(InputStreamImpl::kBufferSize, bytes_read);
+  DoReadCountedStreamTest(buffer_size, buffer_size * 2, &bytes_read);
+  EXPECT_EQ(buffer_size, bytes_read);
 }
 
 TEST_F(InputStreamTest, CheckContentsReadCorrectly) {
@@ -105,3 +105,17 @@ TEST_F(InputStreamTest, CheckContentsReadCorrectly) {
     EXPECT_EQ(i, (unsigned char)buffer->data()[i]);
   }
 }
+
+TEST_F(InputStreamTest, ReadLargeStreamPartial) {
+  const int bytes_requested = 16 * 1024;

[mkosiba (inactive), 2013/09/19 01:58:01]

sorry for the late feedback. could we maybe express this in multiples of
kBufferSize? Then the tests will continue to test the same thing if we ever 
increase the kBufferSize

[Primiano Tucci (use gerrit), 2013/09/19 01:58:55]

Done.

+  int bytes_read = 0;
+  DoReadCountedStreamTest(bytes_requested + 32, bytes_requested, &bytes_read);
+  EXPECT_EQ(bytes_requested, bytes_read);
+}
+
+TEST_F(InputStreamTest, ReadLargeStreamCompletely) {
+  const int bytes_requested = 16 * 1024;
+  int bytes_read = 0;
+  DoReadCountedStreamTest(bytes_requested, bytes_requested, &bytes_read);
+  EXPECT_EQ(bytes_requested, bytes_read);
+}