webkit/tools/test_shell/simple_socket_stream_bridge.cc - Issue 387020: Upstreaming WebKit.gyp

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: webkit/tools/test_shell/simple_socket_stream_bridge.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)

Patch Set: Created 11 years, 1 month ago

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

Jump to:

Index: webkit/tools/test_shell/simple_socket_stream_bridge.cc

diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc

index 223b8c1d3cafd0ac7f42498bf6e9bacd3d2fe6cd..8def341ab4d2d7d519b34e287395929c0c448e89 100644

--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc

+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc

@@ -11,7 +11,7 @@

#include "googleurl/src/gurl.h"

#include "net/socket_stream/socket_stream.h"

#include "net/url_request/url_request_context.h"

-#include "webkit/api/public/WebSocketStreamHandle.h"

+#include "third_party/WebKit/WebKit/chromium/public/WebSocketStreamHandle.h"

#include "webkit/glue/websocketstreamhandle_bridge.h"

#include "webkit/glue/websocketstreamhandle_delegate.h"