diff options
author | jochen <jochen@chromium.org> | 2015-08-04 00:05:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 07:05:48 +0000 |
commit | 90437dd218ba09f01612ebfc47eda167d67fb368 (patch) | |
tree | 77d2fe1ff3c1830af96a8e03c32419c5b5634522 /components/google | |
parent | 31ad3e6a80c367c4f8ea0a921e8f2cfe555a5fd6 (diff) | |
download | chromium_src-90437dd218ba09f01612ebfc47eda167d67fb368.zip chromium_src-90437dd218ba09f01612ebfc47eda167d67fb368.tar.gz chromium_src-90437dd218ba09f01612ebfc47eda167d67fb368.tar.bz2 |
Revert of Move net::FormatUrl and friends outside of //net and into //components (patchset #16 id:290001 of https://codereview.chromium.org/1171333003/ )
Reason for revert:
breaks gn_check on Android: https://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/28796/steps/gn_check/logs/stdio
Original issue's description:
> 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
>
> Committed: https://crrev.com/1659865c3eb47166c82378bb840801135b057a09
> Cr-Commit-Position: refs/heads/master@{#341605}
TBR=droger@chromium.org,jam@chromium.org,mkwst@chromium.org,pkasting@chromium.org,sky@chromium.org,stuartmorgan@chromium.org,felt@chromium.org,rsleevi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=486979
Review URL: https://codereview.chromium.org/1260033005
Cr-Commit-Position: refs/heads/master@{#341691}
Diffstat (limited to 'components/google')
-rw-r--r-- | components/google/DEPS | 2 | ||||
-rw-r--r-- | components/google/core/browser/BUILD.gn | 2 | ||||
-rw-r--r-- | components/google/core/browser/google_util.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/google/DEPS b/components/google/DEPS index 683dd04..c39802b 100644 --- a/components/google/DEPS +++ b/components/google/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+components/url_formatter", + "+components/url_fixer", "+net", ] diff --git a/components/google/core/browser/BUILD.gn b/components/google/core/browser/BUILD.gn index fbff1240..f499496 100644 --- a/components/google/core/browser/BUILD.gn +++ b/components/google/core/browser/BUILD.gn @@ -24,7 +24,7 @@ static_library("browser") { "//components/keyed_service/core", "//components/pref_registry", "//components/strings", - "//components/url_formatter", + "//components/url_fixer", "//net", "//url", ] diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc index b24ba21..2cdfe05 100644 --- a/components/google/core/browser/google_util.cc +++ b/components/google/core/browser/google_util.cc @@ -15,7 +15,7 @@ #include "base/strings/utf_string_conversions.h" #include "components/google/core/browser/google_switches.h" #include "components/google/core/browser/google_url_tracker.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/url_util.h" #include "url/gurl.h" @@ -153,7 +153,7 @@ GURL CommandLineGoogleBaseURL() { switches::kGoogleBaseURL)); if (current_switch_value != switch_value) { switch_value = current_switch_value; - base_url = url_formatter::FixupURL(switch_value, std::string()); + base_url = url_fixer::FixupURL(switch_value, std::string()); if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref()) base_url = GURL(); } |