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/components_tests.gyp | |
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/components_tests.gyp')
-rw-r--r-- | components/components_tests.gyp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 7e88655..018fc1a 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -464,6 +464,7 @@ 'proximity_auth/bluetooth_throttler_impl_unittest.cc', 'proximity_auth/client_impl_unittest.cc', 'proximity_auth/connection_unittest.cc', + 'proximity_auth/device_to_device_operations_unittest.cc', 'proximity_auth/cryptauth/base64url_unittest.cc', 'proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl_unittest.cc', 'proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc', @@ -475,7 +476,6 @@ 'proximity_auth/cryptauth/fake_secure_message_delegate_unittest.cc', 'proximity_auth/cryptauth/sync_scheduler_impl_unittest.cc', 'proximity_auth/device_to_device_operations_unittest.cc', - 'proximity_auth/device_to_device_operations_unittest.cc', 'proximity_auth/device_to_device_secure_context_unittest.cc', 'proximity_auth/logging/logging_unittest.cc', 'proximity_auth/proximity_auth_system_unittest.cc', @@ -547,6 +547,9 @@ 'search_provider_logos/logo_cache_unittest.cc', 'search_provider_logos/logo_tracker_unittest.cc', ], + 'secure_display_unittest_sources': [ + 'secure_display/elide_url_unittest.cc', + ], 'sessions_unittest_sources': [ 'sessions/content/content_serialized_navigation_builder_unittest.cc', 'sessions/content/content_serialized_navigation_driver_unittest.cc', @@ -620,10 +623,8 @@ 'update_client/update_query_params_unittest.cc', 'update_client/update_response_unittest.cc', ], - 'url_formatter_unittest_sources': [ - 'url_formatter/elide_url_unittest.cc', - 'url_formatter/url_fixer_unittest.cc', - 'url_formatter/url_formatter_unittest.cc', + 'url_fixer_unittest_sources': [ + 'url_fixer/url_fixer_unittest.cc', ], 'url_matcher_unittest_sources': [ 'url_matcher/regex_set_matcher_unittest.cc', @@ -756,6 +757,7 @@ '<@(search_unittest_sources)', '<@(search_engines_unittest_sources)', '<@(search_provider_logos_unittest_sources)', + '<@(secure_display_unittest_sources)', '<@(sessions_unittest_sources)', '<@(signin_unittest_sources)', '<@(suggestions_unittest_sources)', @@ -763,7 +765,7 @@ '<@(translate_unittest_sources)', '<@(undo_unittest_sources)', '<@(update_client_unittest_sources)', - '<@(url_formatter_unittest_sources)', + '<@(url_fixer_unittest_sources)', '<@(url_matcher_unittest_sources)', '<@(variations_unittest_sources)', '<@(wallpaper_unittest_sources)', @@ -866,6 +868,7 @@ 'components.gyp:search_engines', 'components.gyp:search_engines_test_support', 'components.gyp:search_provider_logos', + 'components.gyp:secure_display', 'components.gyp:sessions_test_support', 'components.gyp:signin_core_browser', 'components.gyp:signin_core_browser_test_support', @@ -878,6 +881,7 @@ 'components.gyp:undo_component', 'components.gyp:update_client', 'components.gyp:update_client_test_support', + 'components.gyp:url_fixer', 'components.gyp:variations', 'components.gyp:variations_http_provider', 'components.gyp:wallpaper', @@ -887,7 +891,6 @@ 'components_strings.gyp:components_strings', 'components_tests_pak', 'mime_util/mime_util.gyp:mime_util', - 'url_formatter/url_formatter.gyp:url_formatter', ], 'conditions': [ ['enable_rlz_support==1', { |