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/omnibox/browser/url_index_private_data.cc | |
| 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/omnibox/browser/url_index_private_data.cc')
| -rw-r--r-- | components/omnibox/browser/url_index_private_data.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/omnibox/browser/url_index_private_data.cc b/components/omnibox/browser/url_index_private_data.cc index a468d2b..a965c86 100644 --- a/components/omnibox/browser/url_index_private_data.cc +++ b/components/omnibox/browser/url_index_private_data.cc @@ -26,7 +26,7 @@ #include "components/history/core/browser/history_db_task.h" #include "components/history/core/browser/history_service.h" #include "components/omnibox/browser/in_memory_url_index.h" -#include "components/url_formatter/url_formatter.h" +#include "net/base/net_util.h" #if defined(USE_SYSTEM_PROTOBUF) #include <google/protobuf/repeated_field.h> @@ -707,9 +707,10 @@ bool URLIndexPrivateData::IndexRow( history::URLID row_id = row.id(); // Strip out username and password before saving and indexing. - base::string16 url(url_formatter::FormatUrl( - gurl, languages, url_formatter::kFormatUrlOmitUsernamePassword, - net::UnescapeRule::NONE, nullptr, nullptr, nullptr)); + base::string16 url(net::FormatUrl(gurl, languages, + net::kFormatUrlOmitUsernamePassword, + net::UnescapeRule::NONE, + NULL, NULL, NULL)); HistoryID history_id = static_cast<HistoryID>(row_id); DCHECK_LT(history_id, std::numeric_limits<HistoryID>::max()); |