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

Side by Side Diff: net/websockets/websocket_stream_test.cc

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/websockets/websocket_stream.h" 5 #include "net/websockets/websocket_stream.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/metrics/histogram_samples.h" 16 #include "base/metrics/histogram_samples.h"
17 #include "base/metrics/statistics_recorder.h" 17 #include "base/metrics/statistics_recorder.h"
18 #include "base/run_loop.h" 18 #include "base/run_loop.h"
19 #include "base/strings/stringprintf.h" 19 #include "base/strings/stringprintf.h"
20 #include "base/timer/mock_timer.h" 20 #include "base/timer/mock_timer.h"
21 #include "base/timer/timer.h" 21 #include "base/timer/timer.h"
22 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
23 #include "net/base/test_data_directory.h"
24 #include "net/http/http_request_headers.h" 23 #include "net/http/http_request_headers.h"
25 #include "net/http/http_response_headers.h" 24 #include "net/http/http_response_headers.h"
26 #include "net/proxy/proxy_service.h" 25 #include "net/proxy/proxy_service.h"
27 #include "net/socket/client_socket_handle.h" 26 #include "net/socket/client_socket_handle.h"
28 #include "net/socket/socket_test_util.h" 27 #include "net/socket/socket_test_util.h"
29 #include "net/test/cert_test_util.h" 28 #include "net/test/cert_test_util.h"
29 #include "net/test/test_data_directory.h"
30 #include "net/url_request/url_request_test_util.h" 30 #include "net/url_request/url_request_test_util.h"
31 #include "net/websockets/websocket_basic_handshake_stream.h" 31 #include "net/websockets/websocket_basic_handshake_stream.h"
32 #include "net/websockets/websocket_frame.h" 32 #include "net/websockets/websocket_frame.h"
33 #include "net/websockets/websocket_stream_create_test_base.h" 33 #include "net/websockets/websocket_stream_create_test_base.h"
34 #include "net/websockets/websocket_test_util.h" 34 #include "net/websockets/websocket_test_util.h"
35 #include "testing/gtest/include/gtest/gtest.h" 35 #include "testing/gtest/include/gtest/gtest.h"
36 #include "url/gurl.h" 36 #include "url/gurl.h"
37 #include "url/origin.h" 37 #include "url/origin.h"
38 38
39 namespace net { 39 namespace net {
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 CreateAndConnectRawExpectations("ws://localhost/", NoSubProtocols(), 1194 CreateAndConnectRawExpectations("ws://localhost/", NoSubProtocols(),
1195 LocalhostOrigin(), std::move(socket_data)); 1195 LocalhostOrigin(), std::move(socket_data));
1196 WaitUntilConnectDone(); 1196 WaitUntilConnectDone();
1197 EXPECT_TRUE(has_failed()); 1197 EXPECT_TRUE(has_failed());
1198 EXPECT_EQ("Establishing a tunnel via proxy server failed.", 1198 EXPECT_EQ("Establishing a tunnel via proxy server failed.",
1199 failure_message()); 1199 failure_message());
1200 } 1200 }
1201 1201
1202 } // namespace 1202 } // namespace
1203 } // namespace net 1203 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_end_to_end_test.cc ('k') | remoting/protocol/authenticator_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698