net/websockets/websocket_stream.cc - Issue 936953004: Add more targets to GN check.

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/websockets/websocket_stream.cc

Issue 936953004: Add more targets to GN check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move net function 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:

Index: net/websockets/websocket_stream.cc

diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc

index b5012bc2883e4cdc4b2acb2d956cb78f1c79bdee..c0716b8c7611024c6a69dd3206819045506cad75 100644

--- a/net/websockets/websocket_stream.cc

+++ b/net/websockets/websocket_stream.cc

@@ -24,7 +24,6 @@

#include "net/websockets/websocket_handshake_constants.h"

#include "net/websockets/websocket_handshake_stream_base.h"

#include "net/websockets/websocket_handshake_stream_create_helper.h"

-#include "net/websockets/websocket_test_util.h"

#include "url/gurl.h"

#include "url/origin.h"

@@ -121,7 +120,7 @@ class StreamRequestImpl : public WebSocketStreamRequest {

void Start(scoped_ptr<base::Timer> timer) {

DCHECK(timer);

- TimeDelta timeout(TimeDelta::FromSeconds(

+ base::TimeDelta timeout(base::TimeDelta::FromSeconds(

kHandshakeTimeoutIntervalInSeconds));

timer_ = timer.Pass();

timer_->Start(FROM_HERE, timeout,