summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_server_socket_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/ssl_server_socket_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/ssl_server_socket_unittest.cc')
-rw-r--r--net/socket/ssl_server_socket_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 3393348..d5d04b20 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -56,9 +56,9 @@ class FakeDataChannel {
public:
FakeDataChannel()
: read_buf_len_(0),
- weak_factory_(this),
closed_(false),
- write_called_after_close_(false) {
+ write_called_after_close_(false),
+ weak_factory_(this) {
}
int Read(IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
@@ -140,8 +140,6 @@ class FakeDataChannel {
std::queue<scoped_refptr<net::DrainableIOBuffer> > data_;
- base::WeakPtrFactory<FakeDataChannel> weak_factory_;
-
// True if Close() has been called.
bool closed_;
@@ -150,6 +148,8 @@ class FakeDataChannel {
// asynchronously.
bool write_called_after_close_;
+ base::WeakPtrFactory<FakeDataChannel> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(FakeDataChannel);
};