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

Side by Side Diff: net/http/http_proxy_client_socket.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_network_transaction.cc ('k') | net/http/http_proxy_client_socket_pool.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_proxy_client_socket.h" 5 #include "net/http/http_proxy_client_socket.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "googleurl/src/gurl.h"
12 #include "net/base/auth.h" 11 #include "net/base/auth.h"
13 #include "net/base/host_port_pair.h" 12 #include "net/base/host_port_pair.h"
14 #include "net/base/io_buffer.h" 13 #include "net/base/io_buffer.h"
15 #include "net/base/net_log.h" 14 #include "net/base/net_log.h"
16 #include "net/base/net_util.h" 15 #include "net/base/net_util.h"
17 #include "net/http/http_basic_stream.h" 16 #include "net/http/http_basic_stream.h"
18 #include "net/http/http_network_session.h" 17 #include "net/http/http_network_session.h"
19 #include "net/http/http_request_info.h" 18 #include "net/http/http_request_info.h"
20 #include "net/http/http_response_headers.h" 19 #include "net/http/http_response_headers.h"
21 #include "net/http/http_stream_parser.h" 20 #include "net/http/http_stream_parser.h"
22 #include "net/http/proxy_connect_redirect_http_stream.h" 21 #include "net/http/proxy_connect_redirect_http_stream.h"
23 #include "net/socket/client_socket_handle.h" 22 #include "net/socket/client_socket_handle.h"
23 #include "url/gurl.h"
24 24
25 namespace net { 25 namespace net {
26 26
27 HttpProxyClientSocket::HttpProxyClientSocket( 27 HttpProxyClientSocket::HttpProxyClientSocket(
28 ClientSocketHandle* transport_socket, 28 ClientSocketHandle* transport_socket,
29 const GURL& request_url, 29 const GURL& request_url,
30 const std::string& user_agent, 30 const std::string& user_agent,
31 const HostPortPair& endpoint, 31 const HostPortPair& endpoint,
32 const HostPortPair& proxy_server, 32 const HostPortPair& proxy_server,
33 HttpAuthCache* http_auth_cache, 33 HttpAuthCache* http_auth_cache,
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 529
530 int HttpProxyClientSocket::DoTCPRestartComplete(int result) { 530 int HttpProxyClientSocket::DoTCPRestartComplete(int result) {
531 if (result != OK) 531 if (result != OK)
532 return result; 532 return result;
533 533
534 next_state_ = STATE_GENERATE_AUTH_TOKEN; 534 next_state_ = STATE_GENERATE_AUTH_TOKEN;
535 return result; 535 return result;
536 } 536 }
537 537
538 } // namespace net 538 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698