[Cast MRP] Hide audio-only devices for desktop mirroring.

The same change was made to the MR extension to hide audio-only devices
for desktop mirroring proper support is implemented. (bug 849335)

Bug: 849335
Change-Id: I969000c50ba6c07068298e2149f393e8737461f7
Reviewed-on: https://chromium-review.googlesource.com/1167657
Commit-Queue: Derek Cheng <imcheng@chromium.org>
Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581805}

chrome/common/media_router/providers/cast/cast_media_source.cc

@@ -7,7 +7,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
-#include "build/build_config.h"
 #include "chrome/common/media_router/media_source_helper.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
@@ -70,16 +69,10 @@ std::unique_ptr<CastMediaSource> CastMediaSourceForTabMirroring(
 
 std::unique_ptr<CastMediaSource> CastMediaSourceForDesktopMirroring(
     const MediaSource::Id& source_id) {
-// Desktop audio mirroring is only supported on some platforms.
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
-  return std::make_unique<CastMediaSource>(
-      source_id,
-      std::vector<CastAppInfo>({CastAppInfo(kCastStreamingAppId),
-                                CastAppInfo(kCastStreamingAudioAppId)}));
-#else
+  // TODO(https://crbug.com/849335): Add back audio-only devices for desktop
+  // mirroring when proper support is implemented.
   return std::make_unique<CastMediaSource>(
       source_id, std::vector<CastAppInfo>({CastAppInfo(kCastStreamingAppId)}));
-#endif
 }
 
 std::unique_ptr<CastMediaSource> CreateFromURLParams(

chrome/common/media_router/providers/cast/cast_media_source_unittest.cc

@@ -63,8 +63,8 @@ TEST(CastMediaSourceTest, FromPresentationURL) {
   ASSERT_TRUE(source);
   EXPECT_EQ(source_id, source->source_id());
   ASSERT_EQ(2u, source->app_infos().size());
-  EXPECT_EQ("0F5096E8", source->app_infos()[0].app_id);
-  EXPECT_EQ("85CDB22F", source->app_infos()[1].app_id);
+  EXPECT_EQ(kCastStreamingAppId, source->app_infos()[0].app_id);
+  EXPECT_EQ(kCastStreamingAudioAppId, source->app_infos()[1].app_id);
   EXPECT_TRUE(source->client_id().empty());
   EXPECT_EQ(kDefaultLaunchTimeout, source->launch_timeout());
 }
@@ -75,8 +75,19 @@ TEST(CastMediaSourceTest, FromMirroringURN) {
   ASSERT_TRUE(source);
   EXPECT_EQ(source_id, source->source_id());
   ASSERT_EQ(2u, source->app_infos().size());
-  EXPECT_EQ("0F5096E8", source->app_infos()[0].app_id);
-  EXPECT_EQ("85CDB22F", source->app_infos()[1].app_id);
+  EXPECT_EQ(kCastStreamingAppId, source->app_infos()[0].app_id);
+  EXPECT_EQ(kCastStreamingAudioAppId, source->app_infos()[1].app_id);
+  EXPECT_TRUE(source->client_id().empty());
+  EXPECT_EQ(kDefaultLaunchTimeout, source->launch_timeout());
+}
+
+TEST(CastMediaSourceTest, FromDesktopUrn) {
+  MediaSource::Id source_id("urn:x-org.chromium.media:source:desktop");
+  std::unique_ptr<CastMediaSource> source = CastMediaSource::From(source_id);
+  ASSERT_TRUE(source);
+  EXPECT_EQ(source_id, source->source_id());
+  ASSERT_EQ(1u, source->app_infos().size());
+  EXPECT_EQ(kCastStreamingAppId, source->app_infos()[0].app_id);
   EXPECT_TRUE(source->client_id().empty());
   EXPECT_EQ(kDefaultLaunchTimeout, source->launch_timeout());
 }