Commit f584c768 authored by Mario Sanchez Prada's avatar Mario Sanchez Prada Committed by Commit Bot

Migrate references of media_router::mojom::MediaRouterTraitsTestService

Convert both the implementation and clients in the browser and renderer
processes for the media_router.mojom.MediaRouterTraitsTestService
interface, and adapt unit tests.

Bug: 955171
Change-Id: I4856427d46032c66a0dec395cd0711e93ba93700
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816539Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarBrandon Tolsch <btolsch@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#699214}
parent 9ebf9efb
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
#include "chrome/common/media_router/discovery/media_sink_internal.h" #include "chrome/common/media_router/discovery/media_sink_internal.h"
#include "chrome/common/media_router/mojom/media_router.mojom.h" #include "chrome/common/media_router/mojom/media_router.mojom.h"
#include "chrome/common/media_router/mojom/media_router_traits_test_service.mojom.h" #include "chrome/common/media_router/mojom/media_router_traits_test_service.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace media_router { namespace media_router {
...@@ -22,10 +23,10 @@ class MediaRouterStructTraitsTest ...@@ -22,10 +23,10 @@ class MediaRouterStructTraitsTest
MediaRouterStructTraitsTest() {} MediaRouterStructTraitsTest() {}
protected: protected:
mojom::MediaRouterTraitsTestServicePtr GetTraitsTestProxy() { mojo::Remote<mojom::MediaRouterTraitsTestService> GetTraitsTestRemote() {
mojom::MediaRouterTraitsTestServicePtr proxy; mojo::Remote<mojom::MediaRouterTraitsTestService> remote;
traits_test_bindings_.AddBinding(this, mojo::MakeRequest(&proxy)); traits_test_receivers_.Add(this, remote.BindNewPipeAndPassReceiver());
return proxy; return remote;
} }
private: private:
...@@ -36,7 +37,7 @@ class MediaRouterStructTraitsTest ...@@ -36,7 +37,7 @@ class MediaRouterStructTraitsTest
} }
base::test::TaskEnvironment task_environment_; base::test::TaskEnvironment task_environment_;
mojo::BindingSet<MediaRouterTraitsTestService> traits_test_bindings_; mojo::ReceiverSet<MediaRouterTraitsTestService> traits_test_receivers_;
DISALLOW_COPY_AND_ASSIGN(MediaRouterStructTraitsTest); DISALLOW_COPY_AND_ASSIGN(MediaRouterStructTraitsTest);
}; };
...@@ -58,9 +59,10 @@ TEST_F(MediaRouterStructTraitsTest, DialMediaSink) { ...@@ -58,9 +59,10 @@ TEST_F(MediaRouterStructTraitsTest, DialMediaSink) {
MediaSinkInternal dial_sink(sink, extra_data); MediaSinkInternal dial_sink(sink, extra_data);
mojom::MediaRouterTraitsTestServicePtr proxy = GetTraitsTestProxy(); mojo::Remote<mojom::MediaRouterTraitsTestService> remote =
GetTraitsTestRemote();
MediaSinkInternal output; MediaSinkInternal output;
proxy->EchoMediaSink(dial_sink, &output); remote->EchoMediaSink(dial_sink, &output);
EXPECT_EQ(dial_sink, output); EXPECT_EQ(dial_sink, output);
} }
...@@ -81,9 +83,10 @@ TEST_F(MediaRouterStructTraitsTest, CastMediaSink) { ...@@ -81,9 +83,10 @@ TEST_F(MediaRouterStructTraitsTest, CastMediaSink) {
MediaSinkInternal cast_sink(sink, extra_data); MediaSinkInternal cast_sink(sink, extra_data);
mojom::MediaRouterTraitsTestServicePtr proxy = GetTraitsTestProxy(); mojo::Remote<mojom::MediaRouterTraitsTestService> remote =
GetTraitsTestRemote();
MediaSinkInternal output; MediaSinkInternal output;
proxy->EchoMediaSink(cast_sink, &output); remote->EchoMediaSink(cast_sink, &output);
EXPECT_EQ(cast_sink, output); EXPECT_EQ(cast_sink, output);
} }
...@@ -98,9 +101,10 @@ TEST_F(MediaRouterStructTraitsTest, GenericMediaSink) { ...@@ -98,9 +101,10 @@ TEST_F(MediaRouterStructTraitsTest, GenericMediaSink) {
MediaSinkInternal generic_sink; MediaSinkInternal generic_sink;
generic_sink.set_sink(sink); generic_sink.set_sink(sink);
mojom::MediaRouterTraitsTestServicePtr proxy = GetTraitsTestProxy(); mojo::Remote<mojom::MediaRouterTraitsTestService> remote =
GetTraitsTestRemote();
MediaSinkInternal output; MediaSinkInternal output;
proxy->EchoMediaSink(generic_sink, &output); remote->EchoMediaSink(generic_sink, &output);
EXPECT_EQ(generic_sink, output); EXPECT_EQ(generic_sink, output);
} }
......
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