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

Unified Diff: chrome/browser/browsing_data/cookies_tree_model.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve a merge conflict. Created 6 years, 7 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
Index: chrome/browser/browsing_data/cookies_tree_model.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 37a4e6329a483c3a6f57e54cc20e4e6d80755eba..0fb14e550f9c906292a51e2d87bc0fa4da1e8dcb 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -1088,7 +1088,7 @@ void CookiesTreeModel::PopulateCookieInfoWithFilter(
domain = domain.substr(1);
// We treat secure cookies just the same as normal ones.
- source_string = std::string(content::kHttpScheme) +
+ source_string = std::string(url::kHttpScheme) +
content::kStandardSchemeSeparator + domain + "/";
}
@@ -1235,7 +1235,7 @@ void CookiesTreeModel::PopulateServerBoundCertInfoWithFilter(
if (!origin.is_valid()) {
// Domain Bound Cert. Make a valid URL to satisfy the
// CookieTreeRootNode::GetOrCreateHostNode interface.
- origin = GURL(std::string(content::kHttpsScheme) +
+ origin = GURL(std::string(url::kHttpsScheme) +
content::kStandardSchemeSeparator +
cert_info->server_identifier() + "/");
}

Powered by Google App Engine
This is Rietveld 408576698