net/http/http_stream_factory_impl_job.h - Issue 1550843002: Convert enable_bidirectional_stream into build flag local to net.

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

Unified Diff: net/http/http_stream_factory_impl_job.h

Issue 1550843002: Convert enable_bidirectional_stream into build flag local to net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix net_unittests, restore BUILDFLAG checks in headers. Created 4 years, 11 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

Index: net/http/http_stream_factory_impl_job.h

diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h

index 68ea52ad285f23d79d36f5ca0f9c675fb6fd4f60..8f0fcc092ae23aecb2240755d29f97d69d39bef8 100644

--- a/net/http/http_stream_factory_impl_job.h

+++ b/net/http/http_stream_factory_impl_job.h

@@ -17,6 +17,7 @@

#include "net/http/http_request_info.h"

#include "net/http/http_stream_factory_impl.h"

#include "net/log/net_log.h"

+#include "net/net_features.h"

#include "net/proxy/proxy_service.h"

#include "net/quic/quic_stream_factory.h"

#include "net/socket/client_socket_handle.h"

@@ -375,7 +376,7 @@ class HttpStreamFactoryImpl::Job {

scoped_ptr<HttpStream> stream_;

scoped_ptr<WebSocketHandshakeStreamBase> websocket_stream_;

-#if defined(ENABLE_BIDIRECTIONAL_STREAM)

+#if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM)

scoped_ptr<BidirectionalStreamJob> bidirectional_stream_job_;

#endif

« net/http/bidirectional_stream.h ('K') | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | net/net.gyp » ('J')