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

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: Initial patches. 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
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..f48f9ecbcb2c8587ea937aa2f74cf5ac4d3567b7 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -24,6 +24,7 @@
#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/base/url_constants.h"
#include "net/cookies/canonical_cookie.h"
#include "net/url_request/url_request_context.h"
#include "ui/base/l10n/l10n_util.h"
@@ -1088,8 +1089,8 @@ void CookiesTreeModel::PopulateCookieInfoWithFilter(
domain = domain.substr(1);
// We treat secure cookies just the same as normal ones.
- source_string = std::string(content::kHttpScheme) +
- content::kStandardSchemeSeparator + domain + "/";
+ source_string = std::string(net::kHttpScheme) +
+ content::kStandardSchemeSeparator + domain + "/";
}
GURL source(source_string);
@@ -1235,9 +1236,9 @@ 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) +
- content::kStandardSchemeSeparator +
- cert_info->server_identifier() + "/");
+ origin = GURL(std::string(net::kHttpsScheme) +
+ content::kStandardSchemeSeparator +
+ cert_info->server_identifier() + "/");
}
base::string16 title = CookieTreeHostNode::TitleForUrl(origin);
if (!filter.size() || title.find(filter) != base::string16::npos) {

Powered by Google App Engine
This is Rietveld 408576698