Made testserver communicate to parent process with JSON

net/test/test_server_win.cc

 // Copyright (c) 2010 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 "net/test/test_server.h"
 
 #include <windows.h>
 #include <wincrypt.h>
 
 #include "base/base_paths.h"
@@ skipping 127 matching lines @@
                              true,
                              &process_handle_,
                              &job_handle_)) {
     LOG(ERROR) << "Failed to launch " << python_command.command_line_string();
     return false;
   }
 
   return true;
 }
 
+namespace {
+
+bool ReadData(bool* unblocked, HANDLE fd, DWORD bytes_max, uint8* buffer) {
+  DWORD bytes_read = 0;
+  while (bytes_read < bytes_max) {
+    DWORD num_bytes;
+    if (!ReadFile(fd, buffer + bytes_read, bytes_max - bytes_read,
+                  &num_bytes, NULL))
+      return false;
+    if (num_bytes <= 0)
+      return false;
+    if (*unblocked)
+      return false;
+    bytes_read += num_bytes;
+  }
+  return true;
+}
+
+}  // namespace
+
 bool TestServer::WaitToStart() {
+  ScopedHandle read_fd(child_read_fd_.Take());
+  ScopedHandle write_fd(child_write_fd_.Take());
+
   base::Thread thread("test_server_watcher");
   if (!thread.Start())
     return false;
 
   // Prepare a timeout in case the server fails to start.
   bool unblocked = false;
   thread.message_loop()->PostDelayedTask(FROM_HERE,
-      NewRunnableFunction(UnblockPipe, child_write_fd_.Get(), &unblocked),
+      NewRunnableFunction(UnblockPipe, write_fd.Get(), &unblocked),
       TestTimeouts::action_max_timeout_ms());
 
-  // Try to read two bytes from the pipe indicating the ephemeral port number.
-  uint16 port;
-  uint8* buffer = reinterpret_cast<uint8*>(&port);
-  DWORD bytes_read = 0;
-  DWORD bytes_max = sizeof(port);
-  while (bytes_read < bytes_max) {
-    DWORD num_bytes;
-    if (!ReadFile(child_read_fd_, buffer + bytes_read, bytes_max - bytes_read,
-                  &num_bytes, NULL))
-      break;
-    if (num_bytes <= 0)
-      break;
-    bytes_read += num_bytes;
-  }
-  thread.Stop();
-  child_read_fd_.Close();
-  child_write_fd_.Close();
-
-  // If we hit the timeout, fail.
-  if (unblocked)
+  uint32 server_data_len = 0;
+  if (!ReadData(&unblocked, read_fd.Get(), sizeof(server_data_len),
+                reinterpret_cast<uint8*>(&server_data_len)))
+    return false;
+  std::string server_data(server_data_len, '\0');
+  if (!ReadData(&unblocked, read_fd.Get(), server_data_len,
+                reinterpret_cast<uint8*>(&server_data[0])))
     return false;
 
-  // If not enough bytes were read, fail.
-  if (bytes_read < bytes_max)
+  if (!ParseServerData(server_data))

[Paweł Hajdan Jr., 2010/11/18 10:35:12]

nit: Similar comments apply: move anonymous namespace to the beginning of the
file, comment the extracted function, and just return ParseServerData.

[akalin, 2010/11/18 22:38:34]

Done.

     return false;
 
-  host_port_pair_.set_port(port);
   return true;
 }
 
 bool TestServer::CheckCATrusted() {
   HCERTSTORE cert_store = CertOpenSystemStore(NULL, L"ROOT");
   if (!cert_store) {
     LOG(ERROR) << " could not open trusted root CA store";
     return false;
   }
   PCCERT_CONTEXT cert =
@@ skipping 12 matching lines @@
                   "certificate to your trusted roots for this test to work. "
                   "For more info visit:\n"
                   "http://dev.chromium.org/developers/testing\n";
     return false;
   }
 
   return true;
 }
 
 }  // namespace net