Chromium Code Reviews| Index: net/socket/client_socket_pool_base.h |
| diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h |
| index e35ab29fca11f767943d2ff2a676ac216e3921b4..2fc14321da0450ede00558c5dc8d28d861f7381c 100644 |
| --- a/net/socket/client_socket_pool_base.h |
| +++ b/net/socket/client_socket_pool_base.h |
| @@ -243,7 +243,8 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper |
| int id); |
| // See ClientSocketPool::Flush for documentation on this function. |
| - void Flush(); |
| + // Each request aborted by this call will get |error| as the failure reason. |
| + void Flush(int error); |
| // See ClientSocketPool::IsStalled for documentation on this function. |
| bool IsStalled() const; |
| @@ -505,9 +506,9 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper |
| // groups if they are no longer needed. |
| void CancelAllConnectJobs(); |
| - // Iterates through |group_map_|, posting ERR_ABORTED callbacks for all |
| + // Iterates through |group_map_|, posting |error| callbacks for all |
| // requests, and then deleting groups if they are no longer needed. |
| - void AbortAllRequests(); |
| + void AbortAllRequests(int error); |
| // Returns true if we can't create any more sockets due to the total limit. |
| bool ReachedMaxSocketsLimit() const; |
| @@ -708,7 +709,7 @@ class ClientSocketPoolBase { |
| return helper_.ReleaseSocket(group_name, socket, id); |
| } |
| - void Flush() { helper_.Flush(); } |
| + void Flush() { helper_.Flush(ERR_NETWORK_CHANGED); } |
|
willchan no longer on Chromium
2012/12/11 17:39:33
It's non-obvious that Flush() should always mean E
Joao da Silva
2012/12/11 17:52:57
The previous patch sets had ERR_ABORTED here, but
szym
2012/12/11 17:54:45
I agree it's not obvious. I followed the call grap
willchan no longer on Chromium
2012/12/11 18:06:14
Assuming ERR_NETWORK_CHANGED sounds wrong here the
Joao da Silva
2012/12/11 21:14:55
Flush() has been changed to FlushWithError(int) as
|
| bool IsStalled() const { return helper_.IsStalled(); } |