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

Unified Diff: net/cookies/canonical_cookie.cc

Issue 255333003: Renamed namespaces in src/net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tue 04/29/2014 19:22:06.75 Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/x509_certificate.cc ('k') | net/cookies/cookie_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cookies/canonical_cookie.cc
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
index 15b77c7add5ea6dd6c1a52161fc6a08013312333..5d67ebc21828614c10a7d518d2a0f07e6a76c372 100644
--- a/net/cookies/canonical_cookie.cc
+++ b/net/cookies/canonical_cookie.cc
@@ -162,10 +162,10 @@ std::string CanonicalCookie::GetCookieSourceFromURL(const GURL& url) {
if (url.SchemeIsFile())
return url.spec();
- url_canon::Replacements<char> replacements;
+ url::Replacements<char> replacements;
replacements.ClearPort();
if (url.SchemeIsSecure())
- replacements.SetScheme("http", url_parse::Component(0, 4));
+ replacements.SetScheme("http", url::Component(0, 4));
return url.GetOrigin().ReplaceComponents(replacements).spec();
}
@@ -283,11 +283,11 @@ CanonicalCookie* CanonicalCookie::Create(const GURL& url,
if (!parsed_path.empty() && cookie_path != parsed_path)
return NULL;
// Canonicalize path again to make sure it escapes characters as needed.
- url_parse::Component path_component(0, cookie_path.length());
- url_canon::RawCanonOutputT<char> canon_path;
- url_parse::Component canon_path_component;
- url_canon::CanonicalizePath(cookie_path.data(), path_component,
- &canon_path, &canon_path_component);
+ url::Component path_component(0, cookie_path.length());
+ url::RawCanonOutputT<char> canon_path;
+ url::Component canon_path_component;
+ url::CanonicalizePath(cookie_path.data(), path_component, &canon_path,
+ &canon_path_component);
cookie_path = std::string(canon_path.data() + canon_path_component.begin,
canon_path_component.len);
« no previous file with comments | « net/cert/x509_certificate.cc ('k') | net/cookies/cookie_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698