Make GetLoadState virtual in ConnectJob().
This will be necessary for SSLClientSocketPool since the SSLConnectJob will contain a ClientSocketHandle for the TCPClientSocketPool. SSLConnectJob::GetLoadState() will forward to ClientSocketHandle::GetLoadState() if the SSLConnectJob is waiting on requesting a TCP socket.
BUG=http://crbug.com/13289.
Review URL: http://codereview.chromium.org/176024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25032 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 020bc98..970b0ba 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -118,12 +118,15 @@
delegate, load_log),
job_type_(job_type),
client_socket_factory_(client_socket_factory),
- method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+ method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ load_state_(LOAD_STATE_IDLE) {}
void Signal() {
DoConnect(waiting_success_, true /* async */);
}
+ virtual LoadState GetLoadState() const { return load_state_; }
+
private:
// ConnectJob methods:
@@ -162,7 +165,7 @@
MessageLoop::current()->PostTask(
FROM_HERE,
method_factory_.NewRunnableMethod(
- &TestConnectJob::AdvanceLoadState, load_state()));
+ &TestConnectJob::AdvanceLoadState, load_state_));
return ERR_IO_PENDING;
default:
NOTREACHED();
@@ -171,6 +174,8 @@
}
}
+ void set_load_state(LoadState load_state) { load_state_ = load_state; }
+
int DoConnect(bool succeed, bool was_async) {
int result = ERR_CONNECTION_FAILED;
if (succeed) {
@@ -202,6 +207,7 @@
const JobType job_type_;
MockClientSocketFactory* const client_socket_factory_;
ScopedRunnableMethodFactory<TestConnectJob> method_factory_;
+ LoadState load_state_;
DISALLOW_COPY_AND_ASSIGN(TestConnectJob);
};
