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

Side by Side Diff: net/spdy/spdy_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/spdy/spdy_http_utils.h ('k') | net/spdy/spdy_stream.h » ('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/spdy/spdy_proxy_client_socket.h" 5 #include "net/spdy/spdy_proxy_client_socket.h"
6 6
7 #include <algorithm> // min 7 #include <algorithm> // min
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "googleurl/src/gurl.h"
16 #include "net/base/auth.h" 15 #include "net/base/auth.h"
17 #include "net/base/io_buffer.h" 16 #include "net/base/io_buffer.h"
18 #include "net/base/net_util.h" 17 #include "net/base/net_util.h"
19 #include "net/http/http_auth_cache.h" 18 #include "net/http/http_auth_cache.h"
20 #include "net/http/http_auth_handler_factory.h" 19 #include "net/http/http_auth_handler_factory.h"
21 #include "net/http/http_response_headers.h" 20 #include "net/http/http_response_headers.h"
22 #include "net/http/proxy_connect_redirect_http_stream.h" 21 #include "net/http/proxy_connect_redirect_http_stream.h"
23 #include "net/spdy/spdy_http_utils.h" 22 #include "net/spdy/spdy_http_utils.h"
23 #include "url/gurl.h"
24 24
25 namespace net { 25 namespace net {
26 26
27 SpdyProxyClientSocket::SpdyProxyClientSocket( 27 SpdyProxyClientSocket::SpdyProxyClientSocket(
28 const base::WeakPtr<SpdyStream>& spdy_stream, 28 const base::WeakPtr<SpdyStream>& spdy_stream,
29 const std::string& user_agent, 29 const std::string& user_agent,
30 const HostPortPair& endpoint, 30 const HostPortPair& endpoint,
31 const GURL& url, 31 const GURL& url,
32 const HostPortPair& proxy_server, 32 const HostPortPair& proxy_server,
33 const BoundNetLog& source_net_log, 33 const BoundNetLog& source_net_log,
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 } else if (!read_callback_.is_null()) { 511 } else if (!read_callback_.is_null()) {
512 // If we have a read_callback_, the we need to make sure we call it back. 512 // If we have a read_callback_, the we need to make sure we call it back.
513 OnDataReceived(scoped_ptr<SpdyBuffer>()); 513 OnDataReceived(scoped_ptr<SpdyBuffer>());
514 } 514 }
515 // This may have been deleted by read_callback_, so check first. 515 // This may have been deleted by read_callback_, so check first.
516 if (weak_ptr.get() && !write_callback.is_null()) 516 if (weak_ptr.get() && !write_callback.is_null())
517 write_callback.Run(ERR_CONNECTION_CLOSED); 517 write_callback.Run(ERR_CONNECTION_CLOSED);
518 } 518 }
519 519
520 } // namespace net 520 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_http_utils.h ('k') | net/spdy/spdy_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698