Commit edc38890 authored by Yuri Wiitala's avatar Yuri Wiitala Committed by Commit Bot

Roll src/third_party/openscreen/src/ 8e6db3b05..fddca10f2 (11 commits)

Includes trivial changes to ChromeTlsConnectionFactory, after Open
Screen API changes.

https://chromium.googlesource.com/openscreen/+log/8e6db3b055ba..fddca10f23f5

$ git log 8e6db3b05..fddca10f2 --date=short --no-merges --format='%ad %ae %s'
2019-11-26 miu Remove dependencies on openssl from platform/api.
2019-11-26 mfoltz [Open Screen] Move osp/ code into openscreen::osp namespace.
2019-11-26 btolsch Add virtual connection routing
2019-11-22 miu Replace OSP_DCHECK→assert to remove many platform/base deps on util/.
2019-11-23 miu Remove RepeatingFunction, use Alarm instead.
2019-11-25 miu Network interfaces platform API: Separate structs from API.
2019-11-21 rwkeane mDNS: Add Comparison Operators
2019-11-22 miu Move streaming/cast/* to cast/streaming/* and cast/standalone_receiver/*
2019-11-21 fdegans Fix a build issue for platforms with different host and target toolchains.
2019-11-20 rwkeane mDNS: Fix mDNS Receiver Bug
2019-11-20 miu Move platform/api/internal/logging_macros.h → util/logging.h

Created with:
  roll-dep src/third_party/openscreen/src

TBR=mfoltz@chromium.org

Change-Id: I5348d0dd196790c25d3576734df66869d6d77799
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1938455Reviewed-by: default avatarYuri Wiitala <miu@chromium.org>
Commit-Queue: Yuri Wiitala <miu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719490}
parent 3114aa36
......@@ -1265,7 +1265,7 @@ deps = {
Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '6f26bce0b1c4e8ce0e13332f7c0083788def5fdf',
'src/third_party/openscreen/src':
Var('chromium_git') + '/openscreen' + '@' + '8e6db3b055baf1fd37ffb4805a363a9e78cb886e',
Var('chromium_git') + '/openscreen' + '@' + 'fddca10f23f5d483e2768dea6e3e920abb28898c',
'src/third_party/openxr/src': {
'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '46d7cb392019e934e2944bdd317be8ed5176b3f2',
......
......@@ -34,7 +34,7 @@ class MockServiceListenerObserver
MOCK_METHOD1(OnReceiverRemoved, void(const openscreen::ServiceInfo&));
MOCK_METHOD0(OnAllReceiversRemoved, void());
MOCK_METHOD1(OnError, void(openscreen::ServiceListenerError));
MOCK_METHOD1(OnError, void(openscreen::osp::ServiceListenerError));
MOCK_METHOD1(OnMetrics, void(openscreen::ServiceListener::Metrics));
};
......
......@@ -210,8 +210,8 @@ void ChromeTlsConnectionFactory::OnTlsUpgrade(
// TODO(crbug.com/1017903): populate X509 certificate field when it is
// migrated to a CRYPTO_BUFFER. For motivation, see:
// https://boringssl.googlesource.com/boringssl/+/HEAD/PORTING.md
client_->OnConnected(this, nullptr /* X509 certificate */,
std::move(tls_connection));
std::vector<uint8_t> der_x509_certificate;
client_->OnConnected(this, der_x509_certificate, std::move(tls_connection));
}
} // namespace media_router
......@@ -25,7 +25,7 @@ namespace openscreen {
struct IPEndpoint;
namespace platform {
class TlsCredentials;
struct TlsCredentials;
struct TlsListenOptions;
} // namespace platform
......
......@@ -39,11 +39,15 @@ class MockTlsConnectionFactoryClient : public TlsConnectionFactory::Client {
public:
MOCK_METHOD(void,
OnAccepted,
(TlsConnectionFactory*, X509*, std::unique_ptr<TlsConnection>),
(TlsConnectionFactory*,
std::vector<uint8_t>,
std::unique_ptr<TlsConnection>),
(override));
MOCK_METHOD(void,
OnConnected,
(TlsConnectionFactory*, X509*, std::unique_ptr<TlsConnection>),
(TlsConnectionFactory*,
std::vector<uint8_t>,
std::unique_ptr<TlsConnection>),
(override));
MOCK_METHOD(void,
OnConnectionFailed,
......
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