net/spdy/spdy_websocket_stream.h - Issue 301573002: Fix WeakPtrFactory member order in net/spdy and net/dns

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: net/spdy/spdy_websocket_stream.h

Issue 301573002: Fix WeakPtrFactory member order in net/spdy and net/dns (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « net/spdy/spdy_stream.cc ('k') | net/spdy/spdy_websocket_stream.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef NET_SPDY_SPDY_WEBSOCKET_STREAM_H_	5 #ifndef NET_SPDY_SPDY_WEBSOCKET_STREAM_H_

6 #define NET_SPDY_SPDY_WEBSOCKET_STREAM_H_	6 #define NET_SPDY_SPDY_WEBSOCKET_STREAM_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/gtest_prod_util.h"	9 #include "base/gtest_prod_util.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;	81 virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;

82 virtual void OnDataSent() OVERRIDE;	82 virtual void OnDataSent() OVERRIDE;

83 virtual void OnClose(int status) OVERRIDE;	83 virtual void OnClose(int status) OVERRIDE;

84	84

85 private:	85 private:

86 friend class SpdyWebSocketStreamTest;	86 friend class SpdyWebSocketStreamTest;

87 FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamTest, Basic);	87 FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamTest, Basic);

88	88

89 void OnSpdyStreamCreated(int status);	89 void OnSpdyStreamCreated(int status);

90	90

91 base::WeakPtrFactory<SpdyWebSocketStream> weak_ptr_factory_;

92 SpdyStreamRequest stream_request_;	91 SpdyStreamRequest stream_request_;

93 base::WeakPtr<SpdyStream> stream_;	92 base::WeakPtr<SpdyStream> stream_;

94 const base::WeakPtr<SpdySession> spdy_session_;	93 const base::WeakPtr<SpdySession> spdy_session_;

95 size_t pending_send_data_length_;	94 size_t pending_send_data_length_;

96 Delegate* delegate_;	95 Delegate* delegate_;

97	96

	97 base::WeakPtrFactory<SpdyWebSocketStream> weak_ptr_factory_;

	98

98 DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStream);	99 DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStream);

99 };	100 };

100	101

101 } // namespace net	102 } // namespace net

102	103

103 #endif // NET_SPDY_SPDY_WEBSOCKET_STREAM_H_	104 #endif // NET_SPDY_SPDY_WEBSOCKET_STREAM_H_

OLD	NEW