summaryrefslogtreecommitdiffstats
path: root/components/components_tests.gyp
diff options
context:
space:
mode:
authorrsleevi <rsleevi@chromium.org>2015-08-07 14:39:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-07 21:39:50 +0000
commit24f64dc221628032b7843f1af6b277a7f0d6c562 (patch)
treeba2c4bb1d37847b2cd76a4d8d243d1f000e0284e /components/components_tests.gyp
parentd9773981c8733eb55314efad66398350f862c8be (diff)
downloadchromium_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 'components/components_tests.gyp')
-rw-r--r--components/components_tests.gyp17
1 files changed, 7 insertions, 10 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 2ab3b6a..475b750 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -465,7 +465,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',
@@ -477,6 +476,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',
@@ -548,9 +548,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',
@@ -628,8 +625,10 @@
'upload_list_unittest_sources': [
'upload_list/upload_list_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',
@@ -762,7 +761,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)',
@@ -771,7 +769,7 @@
'<@(undo_unittest_sources)',
'<@(update_client_unittest_sources)',
'<@(upload_list_unittest_sources)',
- '<@(url_fixer_unittest_sources)',
+ '<@(url_formatter_unittest_sources)',
'<@(url_matcher_unittest_sources)',
'<@(variations_unittest_sources)',
'<@(wallpaper_unittest_sources)',
@@ -875,7 +873,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',
@@ -889,7 +886,6 @@
'components.gyp:update_client',
'components.gyp:update_client_test_support',
'components.gyp:upload_list',
- 'components.gyp:url_fixer',
'components.gyp:variations',
'components.gyp:variations_http_provider',
'components.gyp:wallpaper',
@@ -899,6 +895,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', {