Commit 779b8916 authored by Wez's avatar Wez Committed by Commit Bot

Roll Fuchsia SDK from c4a06fe7a901 to d9fde06fec56


The AutoRoll server is located here: https://fuchsia-sdk-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio
TBR=cr-fuchsia+bot@chromium.org, fdegans, sergeyu

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I6499e133cd71503143426575ead473bb973be2ea
Reviewed-on: https://chromium-review.googlesource.com/1151096
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Reviewed-by: default avatarFuchsia SDK Autoroller <fuchsia-sdk-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#578565}
parent 7729d9c0
......@@ -2166,7 +2166,7 @@ if (is_ios || is_mac) {
}
if (is_fuchsia) {
fidl_library("test_fidl") {
fidl_library("testfidl") {
namespace = "base.fuchsia"
namespace_path = "base/fuchsia"
......@@ -2680,7 +2680,7 @@ test("base_unittests") {
sources -= [ "files/file_path_watcher_unittest.cc" ]
deps += [
":test_fidl",
":testfidl",
"//third_party/fuchsia-sdk:async",
"//third_party/fuchsia-sdk:async_default",
"//third_party/fuchsia-sdk:fdio",
......
......@@ -29,21 +29,21 @@ class FilteredServiceDirectoryTest : public ServiceDirectoryTestBase {
// Verify that we can connect to a whitelisted service.
TEST_F(FilteredServiceDirectoryTest, Connect) {
filtered_service_dir_->AddService(test_fidl::TestInterface::Name_);
filtered_service_dir_->AddService(testfidl::TestInterface::Name_);
auto stub =
filtered_client_context_->ConnectToService<test_fidl::TestInterface>();
filtered_client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, false);
}
// Verify that multiple connections to the same service work properly.
TEST_F(FilteredServiceDirectoryTest, ConnectMultiple) {
filtered_service_dir_->AddService(test_fidl::TestInterface::Name_);
filtered_service_dir_->AddService(testfidl::TestInterface::Name_);
auto stub1 =
filtered_client_context_->ConnectToService<test_fidl::TestInterface>();
filtered_client_context_->ConnectToService<testfidl::TestInterface>();
auto stub2 =
filtered_client_context_->ConnectToService<test_fidl::TestInterface>();
filtered_client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub1, false);
VerifyTestInterface(&stub2, false);
}
......@@ -51,32 +51,32 @@ TEST_F(FilteredServiceDirectoryTest, ConnectMultiple) {
// Verify that non-whitelisted services are blocked.
TEST_F(FilteredServiceDirectoryTest, ServiceBlocked) {
auto stub =
filtered_client_context_->ConnectToService<test_fidl::TestInterface>();
filtered_client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, true);
}
// Verify that FilteredServiceDirectory handles the case when the target service
// is not available in the underlying service directory.
TEST_F(FilteredServiceDirectoryTest, NoService) {
filtered_service_dir_->AddService(test_fidl::TestInterface::Name_);
filtered_service_dir_->AddService(testfidl::TestInterface::Name_);
service_binding_.reset();
auto stub =
filtered_client_context_->ConnectToService<test_fidl::TestInterface>();
filtered_client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, true);
}
// Verify that FilteredServiceDirectory handles the case when the underlying
// service directory is destroyed.
TEST_F(FilteredServiceDirectoryTest, NoServiceDir) {
filtered_service_dir_->AddService(test_fidl::TestInterface::Name_);
filtered_service_dir_->AddService(testfidl::TestInterface::Name_);
service_binding_.reset();
service_directory_.reset();
auto stub =
filtered_client_context_->ConnectToService<test_fidl::TestInterface>();
filtered_client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, true);
}
......
......@@ -27,7 +27,7 @@ ServiceDirectoryTestBase::ServiceDirectoryTestBase() {
service_directory_ =
std::make_unique<ServiceDirectory>(std::move(service_directory_channel));
service_binding_ =
std::make_unique<ScopedServiceBinding<test_fidl::TestInterface>>(
std::make_unique<ScopedServiceBinding<testfidl::TestInterface>>(
service_directory_.get(), &test_service_);
ConnectClientContextToDirectory("public");
......@@ -53,7 +53,7 @@ void ServiceDirectoryTestBase::ConnectClientContextToDirectory(
}
void ServiceDirectoryTestBase::VerifyTestInterface(
fidl::InterfacePtr<test_fidl::TestInterface>* stub,
fidl::InterfacePtr<testfidl::TestInterface>* stub,
bool expect_error) {
// Call the service and wait for response.
base::RunLoop run_loop;
......
......@@ -9,14 +9,14 @@
#include "base/fuchsia/component_context.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/test_fidl/cpp/fidl.h"
#include "base/fuchsia/testfidl/cpp/fidl.h"
#include "base/message_loop/message_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
namespace fuchsia {
class TestInterfaceImpl : public test_fidl::TestInterface {
class TestInterfaceImpl : public testfidl::TestInterface {
public:
TestInterfaceImpl();
~TestInterfaceImpl() override;
......@@ -31,7 +31,7 @@ class ServiceDirectoryTestBase : public testing::Test {
~ServiceDirectoryTestBase() override;
void ConnectClientContextToDirectory(const char* path);
void VerifyTestInterface(fidl::InterfacePtr<test_fidl::TestInterface>* stub,
void VerifyTestInterface(fidl::InterfacePtr<testfidl::TestInterface>* stub,
bool expect_error);
protected:
......@@ -39,7 +39,7 @@ class ServiceDirectoryTestBase : public testing::Test {
std::unique_ptr<ServiceDirectory> service_directory_;
zx::channel service_directory_client_channel_;
TestInterfaceImpl test_service_;
std::unique_ptr<ScopedServiceBinding<test_fidl::TestInterface>>
std::unique_ptr<ScopedServiceBinding<testfidl::TestInterface>>
service_binding_;
std::unique_ptr<ComponentContext> client_context_;
};
......
......@@ -26,7 +26,7 @@ class ServiceDirectoryTest : public ServiceDirectoryTestBase {};
// ServiceDirectory and that connection is disconnected when the client stub is
// destroyed.
TEST_F(ServiceDirectoryTest, ConnectDisconnect) {
auto stub = client_context_->ConnectToService<test_fidl::TestInterface>();
auto stub = client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, false);
base::RunLoop run_loop;
......@@ -48,8 +48,8 @@ TEST_F(ServiceDirectoryTest, ConnectDisconnect) {
// Verifies that we can connect to the service service more than once.
TEST_F(ServiceDirectoryTest, ConnectMulti) {
auto stub = client_context_->ConnectToService<test_fidl::TestInterface>();
auto stub2 = client_context_->ConnectToService<test_fidl::TestInterface>();
auto stub = client_context_->ConnectToService<testfidl::TestInterface>();
auto stub2 = client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, false);
VerifyTestInterface(&stub2, false);
}
......@@ -57,7 +57,7 @@ TEST_F(ServiceDirectoryTest, ConnectMulti) {
// Verify that services are also exported to the legacy flat service namespace.
TEST_F(ServiceDirectoryTest, ConnectLegacy) {
ConnectClientContextToDirectory(".");
auto stub = client_context_->ConnectToService<test_fidl::TestInterface>();
auto stub = client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, false);
}
......@@ -67,7 +67,7 @@ TEST_F(ServiceDirectoryTest, DirectoryGone) {
service_binding_.reset();
service_directory_.reset();
fidl::InterfacePtr<test_fidl::TestInterface> stub;
fidl::InterfacePtr<testfidl::TestInterface> stub;
zx_status_t status =
client_context_->ConnectToService(FidlInterfaceRequest(&stub));
EXPECT_EQ(status, ZX_ERR_PEER_CLOSED);
......@@ -78,7 +78,7 @@ TEST_F(ServiceDirectoryTest, DirectoryGone) {
// Verify that the case when the service doesn't exist is handled properly.
TEST_F(ServiceDirectoryTest, NoService) {
service_binding_.reset();
auto stub = client_context_->ConnectToService<test_fidl::TestInterface>();
auto stub = client_context_->ConnectToService<testfidl::TestInterface>();
VerifyTestInterface(&stub, true);
}
......
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
library base.fuchsia.test_fidl;
library base.fuchsia.testfidl;
[Discoverable]
interface TestInterface {
......
c4a06fe7a901ee3c23359052bd7d9e448d8207ce
\ No newline at end of file
d9fde06fec56f95b95ebfe463282683c5eff3364
\ No newline at end of file
......@@ -54,11 +54,11 @@ bool MixerOutputStreamFuchsia::Start(int requested_sample_rate, int channels) {
fit::bind_member(this, &MixerOutputStreamFuchsia::OnRendererError));
// Configure the renderer.
fuchsia::media::AudioPcmFormat format;
fuchsia::media::AudioStreamType format;
format.sample_format = fuchsia::media::AudioSampleFormat::FLOAT;
format.channels = channels_;
format.frames_per_second = sample_rate_;
audio_renderer_->SetPcmFormat(std::move(format));
audio_renderer_->SetPcmStreamType(std::move(format));
// Use number of samples to specify media position.
audio_renderer_->SetPtsUnits(sample_rate_, 1);
......
......@@ -37,11 +37,11 @@ bool AudioOutputStreamFuchsia::Open() {
fit::bind_member(this, &AudioOutputStreamFuchsia::OnRendererError));
// Inform the |audio_renderer_| of the format required by the caller.
fuchsia::media::AudioPcmFormat format;
fuchsia::media::AudioStreamType format;
format.sample_format = fuchsia::media::AudioSampleFormat::FLOAT;
format.channels = parameters_.channels();
format.frames_per_second = parameters_.sample_rate();
audio_renderer_->SetPcmFormat(std::move(format));
audio_renderer_->SetPcmStreamType(std::move(format));
// Use number of samples to specify media position.
audio_renderer_->SetPtsUnits(parameters_.sample_rate(), 1);
......
......@@ -221,7 +221,7 @@ fuchsia_sdk_fidl_pkg("media") {
"audio_capturer.fidl",
"audio_renderer.fidl",
"media_transport.fidl",
"media_types.fidl",
"stream_type.fidl",
]
}
......
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