| 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 0fb14e550f9c906292a51e2d87bc0fa4da1e8dcb..b6bb5718a74ef958cbf269b9ee2e82e298b1ebe0 100644
|
| --- a/chrome/browser/browsing_data/cookies_tree_model.cc
|
| +++ b/chrome/browser/browsing_data/cookies_tree_model.cc
|
| @@ -72,7 +72,7 @@ std::string CanonicalizeHost(const GURL& url) {
|
| // "google.com".
|
|
|
| if (url.SchemeIsFile()) {
|
| - return std::string(content::kFileScheme) +
|
| + return std::string(url::kFileScheme) +
|
| content::kStandardSchemeSeparator;
|
| }
|
|
|
| @@ -559,7 +559,7 @@ CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
|
| // static
|
| base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
|
| const std::string file_origin_node_name(
|
| - std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
|
| + std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
|
| return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
|
| : url.host());
|
| }
|
| @@ -583,7 +583,7 @@ CookieTreeHostNode::~CookieTreeHostNode() {}
|
|
|
| const std::string CookieTreeHostNode::GetHost() const {
|
| const std::string file_origin_node_name(
|
| - std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
|
| + std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
|
| return url_.SchemeIsFile() ? file_origin_node_name : url_.host();
|
| }
|
|
|
|
|