Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: net/websockets/websocket_stream.h

Issue 936953004: Add more targets to GN check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gypi ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_stream.h
diff --git a/net/websockets/websocket_stream.h b/net/websockets/websocket_stream.h
index 46dc526219ea5ef63104e3f609197644ee7f48cf..713205a104dee617dcd3fe117ac9f693bdfa3c5a 100644
--- a/net/websockets/websocket_stream.h
+++ b/net/websockets/websocket_stream.h
@@ -22,6 +22,10 @@
class GURL;
+namespace base {
+class Timer;
+}
+
namespace url {
class Origin;
} // namespace url
@@ -31,6 +35,7 @@ namespace net {
class BoundNetLog;
class URLRequestContext;
struct WebSocketFrame;
+class WebSocketHandshakeStreamCreateHelper;
// WebSocketStreamRequest is the caller's handle to the process of creation of a
// WebSocketStream. Deleting the object before the OnSuccess or OnFailure
@@ -210,6 +215,20 @@ void WebSocketDispatchOnFinishOpeningHandshake(
const scoped_refptr<HttpResponseHeaders>& headers,
base::Time response_time);
+// Alternate version of WebSocketStream::CreateAndConnectStream() for testing
+// use only. The differences are the use of a |create_helper| argument in place
+// of |requested_subprotocols| and taking |timer| as the handshake timeout
+// timer. Implemented in websocket_stream.cc.
+NET_EXPORT_PRIVATE scoped_ptr<WebSocketStreamRequest>
+CreateAndConnectStreamForTesting(
+ const GURL& socket_url,
+ scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
+ const url::Origin& origin,
+ URLRequestContext* url_request_context,
+ const BoundNetLog& net_log,
+ scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
+ scoped_ptr<base::Timer> timer);
+
} // namespace net
#endif // NET_WEBSOCKETS_WEBSOCKET_STREAM_H_
« no previous file with comments | « net/net.gypi ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698