Fixes flaky HttpServer.SendRaw failures.

net/server/http_server_unittest.cc

 // Copyright 2013 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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 73 matching lines @@
     return connect_result_;
   }
 
   void Send(const std::string& data) {
     write_buffer_ =
         new DrainableIOBuffer(new StringIOBuffer(data), data.length());
     Write();
   }
 
   bool Read(std::string* message) {
-    net::TestCompletionCallback callback;
-    ReadInternal(callback.callback());
-    int bytes_received = callback.WaitForResult();
-    if (bytes_received <= 0)
-      return false;
-    *message = std::string(read_buffer_->data(), bytes_received);
+    return Read(message, 1);
+  }
+
+  bool Read(std::string* message, int expected_bytes) {
+    int total_bytes_received = 0;

[mef, 2014/04/23 21:46:03]

do you need to clear a |message| here?

[gunsch, 2014/04/24 20:02:47]

Done.

+    while (total_bytes_received < expected_bytes) {
+      net::TestCompletionCallback callback;
+      ReadInternal(callback.callback());
+      int bytes_received = callback.WaitForResult();
+      if (bytes_received <= 0)
+        return false;
+
+      total_bytes_received += bytes_received;
+      message->append(read_buffer_->data(), bytes_received);
+    }
     return true;
   }
 
  private:
   void OnConnect(const base::Closure& quit_loop, int result) {
     connect_result_ = result;
     quit_loop.Run();
   }
 
   void Write() {
@@ skipping 191 matching lines @@
   client.Send("GET /test HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
   server_->Send200(GetConnectionId(0), "Response!", "text/plain");
 
   std::string response;
   ASSERT_TRUE(client.Read(&response));
   ASSERT_TRUE(StartsWithASCII(response, "HTTP/1.1 200 OK", true));
   ASSERT_TRUE(EndsWith(response, "Response!", true));
 }
 
-// Flaky on at least OS X and Vista. http://crbug.com/365067.
-TEST_F(HttpServerTest, DISABLED_SendRaw) {
+TEST_F(HttpServerTest, SendRaw) {
   TestHttpClient client;
   ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
   client.Send("GET /test HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
   server_->SendRaw(GetConnectionId(0), "Raw Data ");
   server_->SendRaw(GetConnectionId(0), "More Data");
   server_->SendRaw(GetConnectionId(0), "Third Piece of Data");
 
   std::string response;
-  ASSERT_TRUE(client.Read(&response));
+  ASSERT_TRUE(client.Read(&response, 37));

[mef, 2014/04/23 21:46:03]

How was this magical number calculated?

[gunsch, 2014/04/24 20:02:47]

Done.

   ASSERT_EQ("Raw Data More DataThird Piece of Data", response);
 }
 
 namespace {
 
 class MockStreamListenSocket : public StreamListenSocket {
  public:
   MockStreamListenSocket(StreamListenSocket::Delegate* delegate)
       : StreamListenSocket(kInvalidSocket, delegate) {}
 
@@ skipping 60 matching lines @@
 
   ASSERT_EQ(client_connection_id, GetConnectionId(2));
   server_->Send200(client_connection_id, "Content for /test3", "text/plain");
   std::string response3;
   ASSERT_TRUE(client.Read(&response3));
   ASSERT_TRUE(StartsWithASCII(response3, "HTTP/1.1 200 OK", true));
   ASSERT_TRUE(EndsWith(response3, "Content for /test3", true));
 }
 
 }  // namespace net