diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/ios/net | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ios/net')
-rw-r--r-- | chromium/ios/net/ios_net.gyp | 58 | ||||
-rw-r--r-- | chromium/ios/net/ios_net_unittests.gyp | 35 |
2 files changed, 93 insertions, 0 deletions
diff --git a/chromium/ios/net/ios_net.gyp b/chromium/ios/net/ios_net.gyp new file mode 100644 index 00000000000..6208ce9c54f --- /dev/null +++ b/chromium/ios/net/ios_net.gyp @@ -0,0 +1,58 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'chromium_code': 1, + }, + 'targets': [ + { + 'target_name': 'ios_net', + 'type': 'static_library', + 'include_dirs': [ + '../..', + ], + 'dependencies': [ + '../../base/base.gyp:base', + '../../net/net.gyp:net', + ], + 'sources': [ + 'clients/crn_forwarding_network_client.h', + 'clients/crn_forwarding_network_client.mm', + 'clients/crn_forwarding_network_client_factory.h', + 'clients/crn_forwarding_network_client_factory.mm', + 'clients/crn_network_client_protocol.h', + 'clients/crn_simple_network_client_factory.h', + 'clients/crn_simple_network_client_factory.mm', + 'cookies/cookie_cache.cc', + 'cookies/cookie_cache.h', + 'cookies/cookie_creation_time_manager.h', + 'cookies/cookie_creation_time_manager.mm', + 'cookies/cookie_store_ios.h', + 'cookies/cookie_store_ios.mm', + 'cookies/cookie_store_ios_client.h', + 'cookies/cookie_store_ios_client.mm', + 'cookies/system_cookie_util.h', + 'cookies/system_cookie_util.mm', + 'crn_http_protocol_handler.h', + 'crn_http_protocol_handler.mm', + 'crn_http_protocol_handler_proxy.h', + 'crn_http_protocol_handler_proxy_with_client_thread.h', + 'crn_http_protocol_handler_proxy_with_client_thread.mm', + 'crn_http_url_response.h', + 'crn_http_url_response.mm', + 'http_protocol_logging.h', + 'http_protocol_logging.mm', + 'nsurlrequest_util.h', + 'nsurlrequest_util.mm', + 'protocol_handler_util.h', + 'protocol_handler_util.mm', + 'request_tracker.h', + 'request_tracker.mm', + 'url_scheme_util.h', + 'url_scheme_util.mm', + ], + }, + ], +} diff --git a/chromium/ios/net/ios_net_unittests.gyp b/chromium/ios/net/ios_net_unittests.gyp new file mode 100644 index 00000000000..8818b33f0fb --- /dev/null +++ b/chromium/ios/net/ios_net_unittests.gyp @@ -0,0 +1,35 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'variables': { + 'chromium_code': 1, + }, + 'targets': [ + { + 'target_name': 'ios_net_unittests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + '../../base/base.gyp:base', + '../../base/base.gyp:run_all_unittests', + '../../net/net.gyp:net_test_support', + '../../testing/gtest.gyp:gtest', + '../../url/url.gyp:url_lib', + 'ios_net.gyp:ios_net', + ], + 'include_dirs': [ + '../..', + ], + 'sources': [ + 'clients/crn_forwarding_network_client_factory_unittest.mm', + 'cookies/cookie_cache_unittest.cc', + 'cookies/cookie_creation_time_manager_unittest.mm', + 'cookies/cookie_store_ios_unittest.mm', + 'cookies/system_cookie_util_unittest.mm', + 'nsurlrequest_util_unittest.mm', + 'protocol_handler_util_unittest.mm', + 'url_scheme_util_unittest.mm', + ], + }, + ], +} |