Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3478)

Unified Diff: chrome/browser/media/router/media_router_type_converters_unittest.cc

Issue 1273423004: Shows a launch spinner next to a sink once it is selected to create a route. The launch spinner sur… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/router/media_router_type_converters_unittest.cc
diff --git a/chrome/browser/media/router/media_router_type_converters_unittest.cc b/chrome/browser/media/router/media_router_type_converters_unittest.cc
index ba6989b62504d1a6b7d6c77f0921972c19e2df28..0ac5b8dfc26ea9ea944291f17449c661e69e2618 100644
--- a/chrome/browser/media/router/media_router_type_converters_unittest.cc
+++ b/chrome/browser/media/router/media_router_type_converters_unittest.cc
@@ -11,10 +11,11 @@
namespace media_router {
TEST(MediaRouterTypeConvertersTest, ConvertMediaSink) {
- MediaSink expected_media_sink("sinkId1", "Sink 1");
+ MediaSink expected_media_sink("sinkId1", "Sink 1", true);
interfaces::MediaSinkPtr expected_mojo_sink(interfaces::MediaSink::New());
expected_mojo_sink->sink_id = "sinkId1";
expected_mojo_sink->name = "Sink 1";
+ expected_mojo_sink->is_launching = true;
interfaces::MediaSinkPtr mojo_sink =
mojo::TypeConverter<interfaces::MediaSinkPtr, MediaSink>::Convert(
@@ -29,6 +30,7 @@ TEST(MediaRouterTypeConvertersTest, ConvertMediaSink) {
// Convert MediaSink and back should result in identical object.
EXPECT_EQ(expected_media_sink.name(), media_sink.name());
EXPECT_EQ(expected_media_sink.id(), media_sink.id());
+ EXPECT_EQ(expected_media_sink.is_launching(), media_sink.is_launching());
EXPECT_TRUE(expected_media_sink.Equals(media_sink));
}
@@ -70,7 +72,7 @@ TEST(MediaRouterTypeConvertersTest, ConvertMediaRoute) {
TEST(MediaRouterTypeConvertersTest, ConvertMediaRouteWithoutOptionalFields) {
MediaRoute expected_media_route("routeId1", MediaSource(),
- MediaSink("sinkId", "sinkName"),
+ MediaSink("sinkId", "sinkName", false),
"Description", false, "");
interfaces::MediaRoutePtr expected_mojo_route(interfaces::MediaRoute::New());
// MediaRoute::media_source is omitted.
@@ -78,6 +80,7 @@ TEST(MediaRouterTypeConvertersTest, ConvertMediaRouteWithoutOptionalFields) {
expected_mojo_route->media_sink = interfaces::MediaSink::New();
expected_mojo_route->media_sink->sink_id = "sinkId";
expected_mojo_route->media_sink->name = "sinkName";
+ expected_mojo_route->media_sink->is_launching = false;
expected_mojo_route->description = "Description";
expected_mojo_route->is_local = false;
« no previous file with comments | « chrome/browser/media/router/media_router_type_converters.cc ('k') | chrome/browser/media/router/media_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698