There was confusion in the mock socket classes due to...

There was confusion in the mock socket classes due to
overlapping names.  The MockSocket is not actually a socket.
It is an interface for fetching data for reads and writes
on a socket.  The MockClientSocket and MockTCPClientSocket
are the actual sockets.

Rename MockSocket to SocketDataProvider.
Rename SSLMockSocket to SSLSocketDataProvider.

Update all tests to reflect name change.

BUG=none
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=31640

[Mike Belshe, 2009-11-11 00:11:27]

This massive code review is ONLY about renaming.

Note - in the individual test cases, we used to have instance names like:
   StaticMockSocket socket(foo)

These changed to
   SocketDataProvider socket(foo)

I didn't change all the instance names.  Many are correct already.  I leave this
final cleanup to the test writers.

[Mike Belshe, 2009-11-11 00:11:45]

Reviewers: eroman,

Message:
This massive code review is ONLY about renaming.

Note - in the individual test cases, we used to have instance names like:
    StaticMockSocket socket(foo)

These changed to
    SocketDataProvider socket(foo)

I didn't change all the instance names.  Many are correct already.  I leave  
this
final cleanup to the test writers.

Description:
There was confusion in the mock socket classes due to
overlapping names.  The MockSocket is not actually a socket.
It is an interface for fetching data for reads and writes
on a socket.  The MockClientSocket and MockTCPClientSocket
are the actual sockets.

Rename MockSocket to SocketDataProvider.
Rename SSLMockSocket to SSLSocketDataProvider.

Update all tests to reflect name change.

BUG=none
TEST=none


Please review this at http://codereview.chromium.org/384024

SVN Base: svn://chrome-svn/chrome/trunk/src/

Affected files:
   M     net/flip/flip_network_transaction_unittest.cc
   M     net/ftp/ftp_network_transaction_unittest.cc
   M     net/http/http_network_layer_unittest.cc
   M     net/http/http_network_transaction_unittest.cc
   M     net/socket/socket_test_util.h
   M     net/socket/socket_test_util.cc
   M     net/socket/socks5_client_socket_unittest.cc
   M     net/socket/socks_client_socket_unittest.cc
   MM    net/socket_stream/socket_stream_unittest.cc
   MM    net/websockets/websocket_unittest.cc

[eroman, 2009-11-11 01:14:41]

lgtm, much better!

http://codereview.chromium.org/384024/diff/1039/22
File net/ftp/ftp_network_transaction_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/22#newcode36
Line 36: class FtpMockControlSocket : public DynamicSocketDataProvider {
[optional] may want to rename this class too?

http://codereview.chromium.org/384024/diff/1039/22#newcode550
Line 550: StaticSocketDataProvider data_socket1(data_reads, NULL);
[optional] might want to rename all of the "data_socketX" to something else.

http://codereview.chromium.org/384024/diff/1039/19
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/384024/diff/1039/19#newcode65
Line 65: net::SocketDataProvider* socket)
could you rename |socket| --> |data|, or |data_provider| ?

http://codereview.chromium.org/384024/diff/1039/19#newcode166
Line 166: net::SSLSocketDataProvider* socket)
ditto.

http://codereview.chromium.org/384024/diff/1039/19#newcode275
Line 275: SocketDataProvider* socket) {
ditto

http://codereview.chromium.org/384024/diff/1039/19#newcode280
Line 280: SSLSocketDataProvider* socket) {
ditto

http://codereview.chromium.org/384024/diff/1039/20
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/384024/diff/1039/20#newcode77
Line 77: // The SocketDataProvider is an interface used by the MockSocket
Should MockSocket instead read MockClientSocket here? (so it corresponds with a
class name).

http://codereview.chromium.org/384024/diff/1039/18
File net/socket/socks5_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/18#newcode48
Line 48: scoped_ptr<SocketDataProvider> mock_socket_;
ditto

http://codereview.chromium.org/384024/diff/1039/21
File net/socket/socks_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/21#newcode42
Line 42: scoped_ptr<SocketDataProvider> mock_socket_;
ditto

[eroman, 2009-11-11 01:15:02]

lgtm, much better!


http://codereview.chromium.org/384024/diff/1039/22
File net/ftp/ftp_network_transaction_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/22#newcode36
Line 36: class FtpMockControlSocket : public DynamicSocketDataProvider {
[optional] may want to rename this class too?

http://codereview.chromium.org/384024/diff/1039/22#newcode550
Line 550: StaticSocketDataProvider data_socket1(data_reads, NULL);
[optional] might want to rename all of the "data_socketX" to something
else.

http://codereview.chromium.org/384024/diff/1039/19
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/384024/diff/1039/19#newcode65
Line 65: net::SocketDataProvider* socket)
could you rename |socket| --> |data|, or |data_provider| ?

http://codereview.chromium.org/384024/diff/1039/19#newcode166
Line 166: net::SSLSocketDataProvider* socket)
ditto.

http://codereview.chromium.org/384024/diff/1039/19#newcode275
Line 275: SocketDataProvider* socket) {
ditto

http://codereview.chromium.org/384024/diff/1039/19#newcode280
Line 280: SSLSocketDataProvider* socket) {
ditto

http://codereview.chromium.org/384024/diff/1039/20
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/384024/diff/1039/20#newcode77
Line 77: // The SocketDataProvider is an interface used by the
MockSocket
Should MockSocket instead read MockClientSocket here? (so it corresponds
with a class name).

http://codereview.chromium.org/384024/diff/1039/18
File net/socket/socks5_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/18#newcode48
Line 48: scoped_ptr<SocketDataProvider> mock_socket_;
ditto

http://codereview.chromium.org/384024/diff/1039/21
File net/socket/socks_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/21#newcode42
Line 42: scoped_ptr<SocketDataProvider> mock_socket_;
ditto

http://codereview.chromium.org/384024

[Mike Belshe, 2009-11-11 01:40:10]

http://codereview.chromium.org/384024/diff/1039/22
File net/ftp/ftp_network_transaction_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/22#newcode36
Line 36: class FtpMockControlSocket : public DynamicSocketDataProvider {
On 2009/11/11 01:14:41, eroman wrote:
> [optional] may want to rename this class too?

Done.

http://codereview.chromium.org/384024/diff/1039/22#newcode550
Line 550: StaticSocketDataProvider data_socket1(data_reads, NULL);
On 2009/11/11 01:14:41, eroman wrote:
> [optional] might want to rename all of the "data_socketX" to something else.

Done.

http://codereview.chromium.org/384024/diff/1039/19
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/384024/diff/1039/19#newcode65
Line 65: net::SocketDataProvider* socket)
On 2009/11/11 01:14:41, eroman wrote:
> could you rename |socket| --> |data|, or |data_provider| ?

Done.

http://codereview.chromium.org/384024/diff/1039/19#newcode166
Line 166: net::SSLSocketDataProvider* socket)
On 2009/11/11 01:14:41, eroman wrote:
> ditto.

Done.

http://codereview.chromium.org/384024/diff/1039/19#newcode275
Line 275: SocketDataProvider* socket) {
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024/diff/1039/19#newcode280
Line 280: SSLSocketDataProvider* socket) {
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024/diff/1039/20
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/384024/diff/1039/20#newcode77
Line 77: // The SocketDataProvider is an interface used by the MockSocket
On 2009/11/11 01:14:41, eroman wrote:
> Should MockSocket instead read MockClientSocket here? (so it corresponds with
a
> class name).

Done.

http://codereview.chromium.org/384024/diff/1039/18
File net/socket/socks5_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/18#newcode48
Line 48: scoped_ptr<SocketDataProvider> mock_socket_;
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024/diff/1039/21
File net/socket/socks_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/21#newcode42
Line 42: scoped_ptr<SocketDataProvider> mock_socket_;
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

[Mike Belshe, 2009-11-11 01:40:42]

http://codereview.chromium.org/384024/diff/1039/22
File net/ftp/ftp_network_transaction_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/22#newcode36
Line 36: class FtpMockControlSocket : public DynamicSocketDataProvider {
On 2009/11/11 01:14:41, eroman wrote:
> [optional] may want to rename this class too?

Done.

http://codereview.chromium.org/384024/diff/1039/22#newcode550
Line 550: StaticSocketDataProvider data_socket1(data_reads, NULL);
On 2009/11/11 01:14:41, eroman wrote:
> [optional] might want to rename all of the "data_socketX" to something
else.

Done.

http://codereview.chromium.org/384024/diff/1039/19
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/384024/diff/1039/19#newcode65
Line 65: net::SocketDataProvider* socket)
On 2009/11/11 01:14:41, eroman wrote:
> could you rename |socket| --> |data|, or |data_provider| ?

Done.

http://codereview.chromium.org/384024/diff/1039/19#newcode166
Line 166: net::SSLSocketDataProvider* socket)
On 2009/11/11 01:14:41, eroman wrote:
> ditto.

Done.

http://codereview.chromium.org/384024/diff/1039/19#newcode275
Line 275: SocketDataProvider* socket) {
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024/diff/1039/19#newcode280
Line 280: SSLSocketDataProvider* socket) {
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024/diff/1039/20
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/384024/diff/1039/20#newcode77
Line 77: // The SocketDataProvider is an interface used by the
MockSocket
On 2009/11/11 01:14:41, eroman wrote:
> Should MockSocket instead read MockClientSocket here? (so it
corresponds with a
> class name).

Done.

http://codereview.chromium.org/384024/diff/1039/18
File net/socket/socks5_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/18#newcode48
Line 48: scoped_ptr<SocketDataProvider> mock_socket_;
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024/diff/1039/21
File net/socket/socks_client_socket_unittest.cc (right):

http://codereview.chromium.org/384024/diff/1039/21#newcode42
Line 42: scoped_ptr<SocketDataProvider> mock_socket_;
On 2009/11/11 01:14:41, eroman wrote:
> ditto

Done.

http://codereview.chromium.org/384024