summaryrefslogtreecommitdiffstats
path: root/components/content_settings
diff options
context:
space:
mode:
Diffstat (limited to 'components/content_settings')
-rw-r--r--components/content_settings/core/browser/BUILD.gn1
-rw-r--r--components/content_settings/core/browser/DEPS1
-rw-r--r--components/content_settings/core/browser/content_settings_usages_state.cc6
3 files changed, 5 insertions, 3 deletions
diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
index 6db040a..85358c0 100644
--- a/components/content_settings/core/browser/BUILD.gn
+++ b/components/content_settings/core/browser/BUILD.gn
@@ -48,6 +48,7 @@ static_library("browser") {
"//components/content_settings/core/common",
"//components/plugins/common",
"//components/pref_registry:pref_registry",
+ "//components/url_formatter",
"//net",
"//url",
]
diff --git a/components/content_settings/core/browser/DEPS b/components/content_settings/core/browser/DEPS
index ee92881..106fea2 100644
--- a/components/content_settings/core/browser/DEPS
+++ b/components/content_settings/core/browser/DEPS
@@ -4,6 +4,7 @@ include_rules = [
"+components/keyed_service/core",
"+components/plugins/common",
"+components/pref_registry",
+ "+components/url_formatter",
"+net/base",
"+net/cookies",
]
diff --git a/components/content_settings/core/browser/content_settings_usages_state.cc b/components/content_settings/core/browser/content_settings_usages_state.cc
index 89b938c..8113260 100644
--- a/components/content_settings/core/browser/content_settings_usages_state.cc
+++ b/components/content_settings/core/browser/content_settings_usages_state.cc
@@ -9,7 +9,7 @@
#include "base/prefs/pref_service.h"
#include "base/strings/utf_string_conversions.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "net/base/net_util.h"
+#include "components/url_formatter/url_formatter.h"
ContentSettingsUsagesState::CommittedDetails::CommittedDetails()
: current_url_valid(false) {
@@ -106,7 +106,7 @@ void ContentSettingsUsagesState::GetDetailedInfo(
std::string ContentSettingsUsagesState::GURLToFormattedHost(
const GURL& url) const {
base::string16 display_host;
- net::AppendFormattedHost(url, pref_service_->GetString(accept_language_pref_),
- &display_host);
+ url_formatter::AppendFormattedHost(
+ url, pref_service_->GetString(accept_language_pref_), &display_host);
return base::UTF16ToUTF8(display_host);
}