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

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

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and revert nss_ocsp.cc changes Created 7 years, 5 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
« no previous file with comments | « net/http/http_auth_handler_mock.h ('k') | net/http/http_proxy_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/format_macros.h" 13 #include "base/format_macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/metrics/field_trial.h" 15 #include "base/metrics/field_trial.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/metrics/stats_counters.h" 17 #include "base/metrics/stats_counters.h"
18 #include "base/stl_util.h" 18 #include "base/stl_util.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/stringprintf.h" 21 #include "base/strings/stringprintf.h"
22 #include "base/values.h" 22 #include "base/values.h"
23 #include "build/build_config.h" 23 #include "build/build_config.h"
24 #include "googleurl/src/gurl.h"
25 #include "net/base/auth.h" 24 #include "net/base/auth.h"
26 #include "net/base/host_port_pair.h" 25 #include "net/base/host_port_pair.h"
27 #include "net/base/io_buffer.h" 26 #include "net/base/io_buffer.h"
28 #include "net/base/load_flags.h" 27 #include "net/base/load_flags.h"
29 #include "net/base/load_timing_info.h" 28 #include "net/base/load_timing_info.h"
30 #include "net/base/net_errors.h" 29 #include "net/base/net_errors.h"
31 #include "net/base/net_util.h" 30 #include "net/base/net_util.h"
32 #include "net/base/upload_data_stream.h" 31 #include "net/base/upload_data_stream.h"
33 #include "net/http/http_auth.h" 32 #include "net/http/http_auth.h"
34 #include "net/http/http_auth_handler.h" 33 #include "net/http/http_auth_handler.h"
(...skipping 17 matching lines...) Expand all
52 #include "net/socket/client_socket_factory.h" 51 #include "net/socket/client_socket_factory.h"
53 #include "net/socket/socks_client_socket_pool.h" 52 #include "net/socket/socks_client_socket_pool.h"
54 #include "net/socket/ssl_client_socket.h" 53 #include "net/socket/ssl_client_socket.h"
55 #include "net/socket/ssl_client_socket_pool.h" 54 #include "net/socket/ssl_client_socket_pool.h"
56 #include "net/socket/transport_client_socket_pool.h" 55 #include "net/socket/transport_client_socket_pool.h"
57 #include "net/spdy/spdy_http_stream.h" 56 #include "net/spdy/spdy_http_stream.h"
58 #include "net/spdy/spdy_session.h" 57 #include "net/spdy/spdy_session.h"
59 #include "net/spdy/spdy_session_pool.h" 58 #include "net/spdy/spdy_session_pool.h"
60 #include "net/ssl/ssl_cert_request_info.h" 59 #include "net/ssl/ssl_cert_request_info.h"
61 #include "net/ssl/ssl_connection_status_flags.h" 60 #include "net/ssl/ssl_connection_status_flags.h"
61 #include "url/gurl.h"
62 62
63 using base::Time; 63 using base::Time;
64 64
65 namespace net { 65 namespace net {
66 66
67 namespace { 67 namespace {
68 68
69 void ProcessAlternateProtocol(HttpStreamFactory* factory, 69 void ProcessAlternateProtocol(HttpStreamFactory* factory,
70 HttpServerProperties* http_server_properties, 70 HttpServerProperties* http_server_properties,
71 const HttpResponseHeaders& headers, 71 const HttpResponseHeaders& headers,
(...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1460 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1461 state); 1461 state);
1462 break; 1462 break;
1463 } 1463 }
1464 return description; 1464 return description;
1465 } 1465 }
1466 1466
1467 #undef STATE_CASE 1467 #undef STATE_CASE
1468 1468
1469 } // namespace net 1469 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_auth_handler_mock.h ('k') | net/http/http_proxy_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698