From 1659865c3eb47166c82378bb840801135b057a09 Mon Sep 17 00:00:00 2001 From: rsleevi Date: Mon, 3 Aug 2015 13:47:03 -0700 Subject: 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@{#341605} --- components/components_tests.gyp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'components/components_tests.gyp') diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 018fc1a..7e88655 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -464,7 +464,6 @@ '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', @@ -476,6 +475,7 @@ '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,9 +547,6 @@ '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', @@ -623,8 +620,10 @@ 'update_client/update_query_params_unittest.cc', 'update_client/update_response_unittest.cc', ], - 'url_fixer_unittest_sources': [ - 'url_fixer/url_fixer_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_matcher_unittest_sources': [ 'url_matcher/regex_set_matcher_unittest.cc', @@ -757,7 +756,6 @@ '<@(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)', @@ -765,7 +763,7 @@ '<@(translate_unittest_sources)', '<@(undo_unittest_sources)', '<@(update_client_unittest_sources)', - '<@(url_fixer_unittest_sources)', + '<@(url_formatter_unittest_sources)', '<@(url_matcher_unittest_sources)', '<@(variations_unittest_sources)', '<@(wallpaper_unittest_sources)', @@ -868,7 +866,6 @@ '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', @@ -881,7 +878,6 @@ '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', @@ -891,6 +887,7 @@ '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', { -- cgit v1.1