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

Side by Side Diff: net/http/http_stream_factory.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_request_info.h ('k') | net/http/http_stream_factory_impl.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_stream_factory.h" 5 #include "net/http/http_stream_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_split.h" 9 #include "base/strings/string_split.h"
10 #include "googleurl/src/gurl.h"
11 #include "net/base/host_mapping_rules.h" 10 #include "net/base/host_mapping_rules.h"
12 #include "net/base/host_port_pair.h" 11 #include "net/base/host_port_pair.h"
12 #include "url/gurl.h"
13 13
14 namespace net { 14 namespace net {
15 15
16 // WARNING: If you modify or add any static flags, you must keep them in sync 16 // WARNING: If you modify or add any static flags, you must keep them in sync
17 // with |ResetStaticSettingsToInit|. This is critical for unit test isolation. 17 // with |ResetStaticSettingsToInit|. This is critical for unit test isolation.
18 18
19 // static 19 // static
20 std::vector<std::string>* HttpStreamFactory::next_protos_ = NULL; 20 std::vector<std::string>* HttpStreamFactory::next_protos_ = NULL;
21 // static 21 // static
22 bool HttpStreamFactory::enabled_protocols_[NUM_ALTERNATE_PROTOCOLS]; 22 bool HttpStreamFactory::enabled_protocols_[NUM_ALTERNATE_PROTOCOLS];
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 enabled_protocols_[QUIC] = true; 221 enabled_protocols_[QUIC] = true;
222 } 222 }
223 } 223 }
224 // TODO(rch): Remove all support for spdy/1. 224 // TODO(rch): Remove all support for spdy/1.
225 enabled_protocols_[NPN_SPDY_1] = false; 225 enabled_protocols_[NPN_SPDY_1] = false;
226 } 226 }
227 227
228 HttpStreamFactory::HttpStreamFactory() {} 228 HttpStreamFactory::HttpStreamFactory() {}
229 229
230 } // namespace net 230 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_request_info.h ('k') | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698