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

Side by Side Diff: net/cookies/cookie_util.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/cookies/cookie_store_unittest.h ('k') | net/dns/dns_config_service_win.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/cookies/cookie_util.h" 5 #include "net/cookies/cookie_util.h"
6 6
7 #include <cstdio> 7 #include <cstdio>
8 #include <cstdlib> 8 #include <cstdlib>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/strings/string_tokenizer.h" 11 #include "base/strings/string_tokenizer.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "googleurl/src/gurl.h"
15 #include "net/base/net_util.h" 14 #include "net/base/net_util.h"
16 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 15 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
16 #include "url/gurl.h"
17 17
18 namespace net { 18 namespace net {
19 namespace cookie_util { 19 namespace cookie_util {
20 20
21 bool DomainIsHostOnly(const std::string& domain_string) { 21 bool DomainIsHostOnly(const std::string& domain_string) {
22 return (domain_string.empty() || domain_string[0] != '.'); 22 return (domain_string.empty() || domain_string[0] != '.');
23 } 23 }
24 24
25 std::string GetEffectiveDomain(const std::string& scheme, 25 std::string GetEffectiveDomain(const std::string& scheme,
26 const std::string& host) { 26 const std::string& host) {
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 return GURL(); 205 return GURL();
206 206
207 const std::string scheme = is_https ? "https" : "http"; 207 const std::string scheme = is_https ? "https" : "http";
208 const std::string host = domain[0] == '.' ? domain.substr(1) : domain; 208 const std::string host = domain[0] == '.' ? domain.substr(1) : domain;
209 return GURL(scheme + "://" + host); 209 return GURL(scheme + "://" + host);
210 } 210 }
211 211
212 } // namespace cookie_utils 212 } // namespace cookie_utils
213 } // namespace net 213 } // namespace net
214 214
OLDNEW
« no previous file with comments | « net/cookies/cookie_store_unittest.h ('k') | net/dns/dns_config_service_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698