Commit 43754386 authored by tommycli's avatar tommycli Committed by Commit bot

Componentize component_updater: Enable tests on iOS.

BUG=371463

Review URL: https://codereview.chromium.org/555523003

Cr-Commit-Position: refs/heads/master@{#294184}
parent 8e369096
...@@ -57,30 +57,23 @@ ...@@ -57,30 +57,23 @@
'component_updater/url_fetcher_downloader.h', 'component_updater/url_fetcher_downloader.h',
], ],
}, },
], {
# GN version: //components/component_updater:test_support
'conditions': [ 'target_name': 'component_updater_test_support',
['OS != "ios"', { 'type': 'static_library',
'targets': [ 'dependencies': [
{ 'component_updater',
# GN version: //components/component_updater:test_support '../testing/gmock.gyp:gmock',
'target_name': 'component_updater_test_support', '../testing/gtest.gyp:gtest',
'type': 'static_library', ],
'dependencies': [ 'sources': [
'component_updater', 'component_updater/test/test_configurator.cc',
'../testing/gmock.gyp:gmock', 'component_updater/test/test_configurator.h',
'../testing/gtest.gyp:gtest', 'component_updater/test/test_installer.cc',
], 'component_updater/test/test_installer.h',
'sources': [ 'component_updater/test/url_request_post_interceptor.cc',
'component_updater/test/test_configurator.cc', 'component_updater/test/url_request_post_interceptor.h',
'component_updater/test/test_configurator.h',
'component_updater/test/test_installer.cc',
'component_updater/test/test_installer.h',
'component_updater/test/url_request_post_interceptor.cc',
'component_updater/test/url_request_post_interceptor.h',
],
},
], ],
}], },
], ],
} }
...@@ -122,7 +122,7 @@ const char* kInvalidVersion = ...@@ -122,7 +122,7 @@ const char* kInvalidVersion =
// must be able to parse responses that include namespaces. // must be able to parse responses that include namespaces.
const char* kUsesNamespacePrefix = const char* kUsesNamespacePrefix =
"<?xml version='1.0' encoding='UTF-8'?>" "<?xml version='1.0' encoding='UTF-8'?>"
"<g:response xmlns='http://www.google.com/update2/response' protocol='3.0'>" "<g:response xmlns:g='http://www.google.com/update2/response' protocol='3.0'>"
" <g:app appid='12345'>" " <g:app appid='12345'>"
" <g:updatecheck status='ok'>" " <g:updatecheck status='ok'>"
" <g:urls>" " <g:urls>"
......
...@@ -290,6 +290,11 @@ ...@@ -290,6 +290,11 @@
# Dependencies of cloud_devices # Dependencies of cloud_devices
'components.gyp:cloud_devices_common', 'components.gyp:cloud_devices_common',
# Dependencies of component_updater
'components.gyp:component_updater',
'components.gyp:component_updater_test_support',
'../third_party/libxml/libxml.gyp:libxml',
# Dependencies of crash # Dependencies of crash
'components.gyp:crash_test_support', 'components.gyp:crash_test_support',
...@@ -444,11 +449,6 @@ ...@@ -444,11 +449,6 @@
'components.gyp:autofill_content_renderer', 'components.gyp:autofill_content_renderer',
'components.gyp:autofill_content_test_support', 'components.gyp:autofill_content_test_support',
# Dependencies of component_updater
'components.gyp:component_updater',
'components.gyp:component_updater_test_support',
'../third_party/libxml/libxml.gyp:libxml',
# Dependencies of dom_distiller # Dependencies of dom_distiller
'components.gyp:dom_distiller_content', 'components.gyp:dom_distiller_content',
...@@ -495,6 +495,7 @@ ...@@ -495,6 +495,7 @@
['include', '^auto_login_parser/'], ['include', '^auto_login_parser/'],
['include', '^autofill/core/'], ['include', '^autofill/core/'],
['include', '^bookmarks/'], ['include', '^bookmarks/'],
['include', '^component_updater/'],
['include', '^crash/'], ['include', '^crash/'],
['include', '^data_reduction_proxy/'], ['include', '^data_reduction_proxy/'],
['include', '^dom_distiller/'], ['include', '^dom_distiller/'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment