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

Side by Side Diff: net/http/http_stream_factory_impl.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_stream_factory.cc ('k') | net/http/http_stream_factory_impl_request.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/http/http_stream_factory_impl.h" 5 #include "net/http/http_stream_factory_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "googleurl/src/gurl.h"
12 #include "net/base/net_log.h" 11 #include "net/base/net_log.h"
13 #include "net/base/net_util.h" 12 #include "net/base/net_util.h"
14 #include "net/http/http_network_session.h" 13 #include "net/http/http_network_session.h"
15 #include "net/http/http_pipelined_connection.h" 14 #include "net/http/http_pipelined_connection.h"
16 #include "net/http/http_pipelined_host.h" 15 #include "net/http/http_pipelined_host.h"
17 #include "net/http/http_pipelined_stream.h" 16 #include "net/http/http_pipelined_stream.h"
18 #include "net/http/http_server_properties.h" 17 #include "net/http/http_server_properties.h"
19 #include "net/http/http_stream_factory_impl_job.h" 18 #include "net/http/http_stream_factory_impl_job.h"
20 #include "net/http/http_stream_factory_impl_request.h" 19 #include "net/http/http_stream_factory_impl_request.h"
21 #include "net/spdy/spdy_http_stream.h" 20 #include "net/spdy/spdy_http_stream.h"
21 #include "url/gurl.h"
22 22
23 namespace net { 23 namespace net {
24 24
25 namespace { 25 namespace {
26 26
27 const PortAlternateProtocolPair kNoAlternateProtocol = { 27 const PortAlternateProtocolPair kNoAlternateProtocol = {
28 0, UNINITIALIZED_ALTERNATE_PROTOCOL 28 0, UNINITIALIZED_ALTERNATE_PROTOCOL
29 }; 29 };
30 30
31 GURL UpgradeUrlToHttps(const GURL& original_url, int port) { 31 GURL UpgradeUrlToHttps(const GURL& original_url, int port) {
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 it != requests_to_fail.end(); ++it) { 351 it != requests_to_fail.end(); ++it) {
352 Request* request = *it; 352 Request* request = *it;
353 if (request == request_map_[job]) { 353 if (request == request_map_[job]) {
354 continue; 354 continue;
355 } 355 }
356 request->OnStreamFailed(NULL, status, used_ssl_config); 356 request->OnStreamFailed(NULL, status, used_ssl_config);
357 } 357 }
358 } 358 }
359 359
360 } // namespace net 360 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698