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

Side by Side Diff: net/http/http_network_transaction_spdy2_unittest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/json/json_writer.h" 16 #include "base/json/json_writer.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/string_util.h" 19 #include "base/string_util.h"
20 #include "base/test/test_file_util.h" 20 #include "base/test/test_file_util.h"
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #include "net/base/auth.h" 22 #include "net/base/auth.h"
23 #include "net/base/capturing_net_log.h" 23 #include "net/base/capturing_net_log.h"
24 #include "net/base/cert_test_util.h" 24 #include "net/base/cert_test_util.h"
25 #include "net/base/completion_callback.h" 25 #include "net/base/completion_callback.h"
26 #include "net/base/host_cache.h" 26 #include "net/base/host_cache.h"
27 #include "net/base/load_timing_info.h" 27 #include "net/base/load_timing_info.h"
28 #include "net/base/load_timing_info_test_util.h" 28 #include "net/base/load_timing_info_test_util.h"
29 #include "net/base/mock_cert_verifier.h" 29 #include "net/base/mock_cert_verifier.h"
30 #include "net/base/mock_host_resolver.h"
31 #include "net/base/net_log.h" 30 #include "net/base/net_log.h"
32 #include "net/base/net_log_unittest.h" 31 #include "net/base/net_log_unittest.h"
33 #include "net/base/request_priority.h" 32 #include "net/base/request_priority.h"
34 #include "net/base/test_completion_callback.h" 33 #include "net/base/test_completion_callback.h"
35 #include "net/base/test_data_directory.h" 34 #include "net/base/test_data_directory.h"
36 #include "net/base/upload_bytes_element_reader.h" 35 #include "net/base/upload_bytes_element_reader.h"
37 #include "net/base/upload_data_stream.h" 36 #include "net/base/upload_data_stream.h"
38 #include "net/base/upload_file_element_reader.h" 37 #include "net/base/upload_file_element_reader.h"
38 #include "net/dns/mock_host_resolver.h"
39 #include "net/http/http_auth_handler_digest.h" 39 #include "net/http/http_auth_handler_digest.h"
40 #include "net/http/http_auth_handler_mock.h" 40 #include "net/http/http_auth_handler_mock.h"
41 #include "net/http/http_auth_handler_ntlm.h" 41 #include "net/http/http_auth_handler_ntlm.h"
42 #include "net/http/http_basic_stream.h" 42 #include "net/http/http_basic_stream.h"
43 #include "net/http/http_network_session.h" 43 #include "net/http/http_network_session.h"
44 #include "net/http/http_network_session_peer.h" 44 #include "net/http/http_network_session_peer.h"
45 #include "net/http/http_server_properties_impl.h" 45 #include "net/http/http_server_properties_impl.h"
46 #include "net/http/http_stream.h" 46 #include "net/http/http_stream.h"
47 #include "net/http/http_stream_factory.h" 47 #include "net/http/http_stream_factory.h"
48 #include "net/http/http_transaction_unittest.h" 48 #include "net/http/http_transaction_unittest.h"
(...skipping 11228 matching lines...) Expand 10 before | Expand all | Expand 10 after
11277 trans2.Start(&request2, callback2.callback(), BoundNetLog())); 11277 trans2.Start(&request2, callback2.callback(), BoundNetLog()));
11278 MessageLoop::current()->RunUntilIdle(); 11278 MessageLoop::current()->RunUntilIdle();
11279 data2->RunFor(3); 11279 data2->RunFor(3);
11280 11280
11281 ASSERT_TRUE(callback2.have_result()); 11281 ASSERT_TRUE(callback2.have_result());
11282 EXPECT_EQ(OK, callback2.WaitForResult()); 11282 EXPECT_EQ(OK, callback2.WaitForResult());
11283 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); 11283 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy);
11284 } 11284 }
11285 11285
11286 } // namespace net 11286 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698