| Index: net/websockets/websocket_stream.cc
|
| diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc
|
| index b0abb3cadb962e738b28203a32b1c9db795977f9..32729fba517570cfbc4e1a72e414fd29c1b9d15b 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"
|
|
|
| @@ -114,7 +113,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,
|
|
|