Another attempt to fix a Chrome crash.

chrome/browser/net/network_stats.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_NET_NETWORK_STATS_H_
 #define CHROME_BROWSER_NET_NETWORK_STATS_H_
 
 #include <bitset>
 #include <string>
 #include <vector>
@@ skipping 124 matching lines @@
   // This function calls TestPhaseComplete() if there is a significant network
   // error or if all packets in the current test are received.
   // Return true if TestPhaseComplete() is called otherwise return false.
   bool ReadComplete(int result);
 
   // Callbacks when an internal IO (Read or Write) is completed.
   void OnReadComplete(int result);
   void OnWriteComplete(int result);
 
   // Read data from server until an error or IO blocking occurs or reading is
-  // complete.
-  void ReadData();
+  // complete. Return the result value from socket reading and 0 if |socket_|
+  // is Null.
+  int ReadData();
 
   // Send data contained in |str| to server.
   // Return a negative value if IO blocking occurs or there is an error.
   // Otherwise return net::OK.
   int SendData(const std::string& str);
 
   // Update the send buffer (telling it that |bytes_sent| has been sent).
   // And reset |write_buffer_|.
   void UpdateSendBuffer(int bytes_sent);
 
@@ skipping 198 matching lines @@
 // This starts a series of tests randomly selected among one of the three
 // choices of probe packet sizes: 100 Bytes, 500 Bytes, 1200 Bytes.
 void StartNetworkStatsTest(net::HostResolver* host_resolver,
                            const net::HostPortPair& server_address,
                            uint16 histogram_port,
                            bool has_proxy_server);
 
 }  // namespace chrome_browser_net
 
 #endif  // CHROME_BROWSER_NET_NETWORK_STATS_H_