summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_base_unittest.cc
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-10 20:44:39 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-10 20:44:39 +0000
commitd5492c511c42c3b638852e66e49a272f210692c7 (patch)
tree8eb04bf1049f84180b5368836f711202b6648afa /net/socket/client_socket_pool_base_unittest.cc
parent7277cf418a5aafcaee520739d0fb81452121e1c1 (diff)
downloadchromium_src-d5492c511c42c3b638852e66e49a272f210692c7.zip
chromium_src-d5492c511c42c3b638852e66e49a272f210692c7.tar.gz
chromium_src-d5492c511c42c3b638852e66e49a272f210692c7.tar.bz2
Fix WeakPtrFactory member order in net/socket/.
This CL also adds some missing DISALLOW_COPY_AND_ASSIGN macros in the affected files. BUG=303818 Review URL: https://codereview.chromium.org/62973003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base_unittest.cc')
-rw-r--r--net/socket/client_socket_pool_base_unittest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index bbeca2f..a35327a 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -265,9 +265,10 @@ class TestConnectJob : public ConnectJob {
BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)),
job_type_(job_type),
client_socket_factory_(client_socket_factory),
- weak_factory_(this),
load_state_(LOAD_STATE_IDLE),
- store_additional_error_state_(false) {}
+ store_additional_error_state_(false),
+ weak_factory_(this) {
+ }
void Signal() {
DoConnect(waiting_success_, true /* async */, false /* recoverable */);
@@ -400,10 +401,11 @@ class TestConnectJob : public ConnectJob {
bool waiting_success_;
const JobType job_type_;
MockClientSocketFactory* const client_socket_factory_;
- base::WeakPtrFactory<TestConnectJob> weak_factory_;
LoadState load_state_;
bool store_additional_error_state_;
+ base::WeakPtrFactory<TestConnectJob> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(TestConnectJob);
};