From 70948d68e3925e415e29d74230c4c0b39fbf31a4 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Tue, 11 Aug 2015 03:46:35 -0700 Subject: Move ClipboardURLProvider into //components/omnibox. Move ClipboardURLProvider with the other AutocompleteProvider into //components/omnibox to simplify the construction of the provider and break circular dependency of open_from_clipboard and omnibox components. Introduce a new AutocompleteProvider::Type for this new provider (AutocompleteProvider::TYPE_CLIPBOARD_URL) with the corresponding value in OmniboxEventProto enumeration. Pass the AutocompleteProviderClient to the ClipboardURLProvider and remove another layer of indirection for the construction of the AutocompleteMatch. Add AutocompleteProvider::TYPE_CLIPBOARD_URL to the default list of providers and construct, if ClipboardRecentContent singleton exists (currently only implemented on iOS), a ClipboardURLProvider. Add unit tests for ClipboardURLProvider. BUG=517134,517017,514225 Review URL: https://codereview.chromium.org/1273013002 Cr-Commit-Position: refs/heads/master@{#342806} --- components/components_tests.gyp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'components/components_tests.gyp') diff --git a/components/components_tests.gyp b/components/components_tests.gyp index e04bad9..d5f78fe 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -353,12 +353,16 @@ 'omnibox/browser/autocomplete_match_unittest.cc', 'omnibox/browser/autocomplete_result_unittest.cc', 'omnibox/browser/base_search_provider_unittest.cc', + 'omnibox/browser/clipboard_url_provider_unittest.cc', 'omnibox/browser/in_memory_url_index_types_unittest.cc', 'omnibox/browser/keyword_provider_unittest.cc', 'omnibox/browser/omnibox_field_trial_unittest.cc', 'omnibox/browser/scored_history_match_unittest.cc', 'omnibox/browser/suggestion_answer_unittest.cc', ], + 'open_from_clipboard_unittest_sources': [ + 'open_from_clipboard/clipboard_recent_content_ios_unittest.mm', + ], 'os_crypt_unittest_sources': [ 'os_crypt/ie7_password_win_unittest.cc', 'os_crypt/keychain_password_mac_unittest.mm', @@ -745,8 +749,8 @@ '<@(enhanced_bookmarks_unittest_sources)', '<@(favicon_base_unittest_sources)', '<@(favicon_unittest_sources)', - '<@(gcm_driver_unittest_sources)', '<@(gcm_driver_crypto_unittest_sources)', + '<@(gcm_driver_unittest_sources)', '<@(google_unittest_sources)', '<@(history_unittest_sources)', '<@(instance_id_unittest_sources)', @@ -760,6 +764,7 @@ '<@(network_time_unittest_sources)', '<@(offline_page_unittest_sources)', '<@(omnibox_unittest_sources)', + '<@(open_from_clipboard_unittest_sources)', '<@(os_crypt_unittest_sources)', '<@(packed_ct_ev_whitelist_unittest_sources)', '<@(password_manager_unittest_sources)', @@ -767,9 +772,9 @@ '<@(proxy_config_unittest_sources)', '<@(query_parser_unittest_sources)', '<@(rappor_unittest_sources)', - '<@(search_unittest_sources)', '<@(search_engines_unittest_sources)', '<@(search_provider_logos_unittest_sources)', + '<@(search_unittest_sources)', '<@(sessions_unittest_sources)', '<@(signin_unittest_sources)', '<@(suggestions_unittest_sources)', @@ -868,6 +873,8 @@ 'components.gyp:offline_pages', 'components.gyp:omnibox_browser', 'components.gyp:omnibox_test_support', + 'components.gyp:open_from_clipboard', + 'components.gyp:open_from_clipboard_test_support', 'components.gyp:os_crypt', 'components.gyp:packed_ct_ev_whitelist', 'components.gyp:password_manager_core_browser', @@ -1035,7 +1042,6 @@ ], }, { # 'OS == "ios"' 'sources': [ - 'open_from_clipboard/clipboard_recent_content_ios_unittest.mm', 'webp_transcode/webp_decoder_unittest.mm', 'webp_transcode/webp_network_client_unittest.mm', ], @@ -1055,7 +1061,6 @@ '../ios/web/ios_web.gyp:test_support_ios_web', '../third_party/ocmock/ocmock.gyp:ocmock', 'components.gyp:autofill_ios_browser', - 'components.gyp:open_from_clipboard', 'components.gyp:sessions_ios', 'components.gyp:signin_ios_browser', 'components.gyp:signin_ios_browser_test_support', -- cgit v1.1