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

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

Issue 23064011: Consolidate scheme checks into an easy GURL method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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
« no previous file with comments | « net/http/http_auth_cache.cc ('k') | net/proxy/proxy_script_fetcher_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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // The rules for parsing content-types were borrowed from Firefox: 5 // The rules for parsing content-types were borrowed from Firefox:
6 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834 6 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
7 7
8 #include "net/http/http_util.h" 8 #include "net/http/http_util.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
12 12
13 namespace net { 13 namespace net {
14 14
15 // static 15 // static
16 std::string HttpUtil::PathForRequest(const GURL& url) { 16 std::string HttpUtil::PathForRequest(const GURL& url) {
17 DCHECK(url.is_valid() && (url.SchemeIs("http") || url.SchemeIs("https"))); 17 DCHECK(url.is_valid() && url.SchemeIsHTTPOrHTTPS());
18 if (url.has_query()) 18 if (url.has_query())
19 return url.path() + "?" + url.query(); 19 return url.path() + "?" + url.query();
20 return url.path(); 20 return url.path();
21 } 21 }
22 22
23 // static 23 // static
24 std::string HttpUtil::SpecForRequest(const GURL& url) { 24 std::string HttpUtil::SpecForRequest(const GURL& url) {
25 // We may get ftp scheme when fetching ftp resources through proxy. 25 // We may get ftp scheme when fetching ftp resources through proxy.
26 DCHECK(url.is_valid() && (url.SchemeIs("http") || 26 DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() ||
27 url.SchemeIs("https") ||
28 url.SchemeIs("ftp"))); 27 url.SchemeIs("ftp")));
29 return SimplifyUrlForRequest(url).spec(); 28 return SimplifyUrlForRequest(url).spec();
30 } 29 }
31 30
32 } // namespace net 31 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_auth_cache.cc ('k') | net/proxy/proxy_script_fetcher_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698