diff options
| author | rsleevi <rsleevi@chromium.org> | 2015-08-07 14:39:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 21:39:50 +0000 |
| commit | 24f64dc221628032b7843f1af6b277a7f0d6c562 (patch) | |
| tree | ba2c4bb1d37847b2cd76a4d8d243d1f000e0284e /chrome/browser/policy/url_blacklist_manager_unittest.cc | |
| parent | d9773981c8733eb55314efad66398350f862c8be (diff) | |
| download | chromium_src-24f64dc221628032b7843f1af6b277a7f0d6c562.zip chromium_src-24f64dc221628032b7843f1af6b277a7f0d6c562.tar.gz chromium_src-24f64dc221628032b7843f1af6b277a7f0d6c562.tar.bz2 | |
Move net::FormatUrl and friends outside of //net and into //components
net::FormatUrl and related are specifically concerned with display
policies of URLs, which is not something that //net needs to be aware
of, as that's a UX question.
This folds in net::FormatURL along with the existing //components/url_fixer
and //components/secure_display into a common component,
//components/url_formatter, that handles reformatting URLs for user-friendly
or data storage (url_formatter), for use in security prompts (elide_url),
or for reformatting URLs from user input (url_fixer)
(Disabling presubmit since this is intentionally not fixing a legacy API, just moving it for future cleanups)
BUG=486979
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1171333003
Cr-Commit-Position: refs/heads/master@{#342445}
Diffstat (limited to 'chrome/browser/policy/url_blacklist_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/policy/url_blacklist_manager_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index a21df06..b00a9a3 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -15,7 +15,7 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/policy/policy_helpers.h" #include "components/policy/core/common/policy_pref_names.h" -#include "components/url_fixer/url_fixer.h" +#include "components/url_formatter/url_fixer.h" #include "google_apis/gaia/gaia_urls.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" @@ -25,7 +25,7 @@ // TODO(joaodasilva): this file should be moved next to // components/policy/core/browser/url_blacklist_manager.(cc|h). // However, url_fixer_upper.h can't be included from the component. Rather -// than having it mocked out, the actual url_fixer::SegmentURL call is used +// than having it mocked out, the actual url_formatter::SegmentURL call is used // to make sure that the parsing of URL filters is correct. namespace policy { @@ -34,7 +34,7 @@ namespace { // Helper to get the disambiguated SegmentURL() function. URLBlacklist::SegmentURLCallback GetSegmentURLCallback() { - return url_fixer::SegmentURL; + return url_formatter::SegmentURL; } class TestingURLBlacklistManager : public URLBlacklistManager { |