[Media Router] Move MediaSink::IconType class to top level

Move IconType class out of MediaSink class in media_sink.h and media_router.mojom

Bug: 694841
Change-Id: I710adea06557c63e061bb428dbaed7038eb8d956
Reviewed-on: https://chromium-review.googlesource.com/574900Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Derek Cheng <imcheng@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Commit-Queue: Bin Zhao <zhaobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488297}

chrome/browser/media/android/router/media_router_android_bridge.cc

@@ -126,7 +126,7 @@ void MediaRouterAndroidBridge::OnSinksReceived(
         env, java_media_router_, jsource_urn, i);
     sinks_converted.push_back(MediaSink(
         ConvertJavaStringToUTF8(env, jsink_urn.obj()),
-        ConvertJavaStringToUTF8(env, jsink_name.obj()), MediaSink::GENERIC));
+        ConvertJavaStringToUTF8(env, jsink_name.obj()), SinkIconType::GENERIC));
   }
   native_media_router_->OnSinksReceived(
       ConvertJavaStringToUTF8(env, jsource_urn), sinks_converted);

chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc

@@ -105,7 +105,7 @@ void DialMediaSinkServiceImpl::OnDeviceDescriptionAvailable(
   // ID when it is sent to the extension, because it derives a different sink ID
   // using the given sink ID.
   MediaSink sink(description_data.unique_id, description_data.friendly_name,
-                 MediaSink::IconType::GENERIC);
+                 SinkIconType::GENERIC);
   DialSinkExtraData extra_data;
   extra_data.app_url = description_data.app_url;
   extra_data.model_name = description_data.model_name;

chrome/browser/media/router/discovery/mdns/cast_media_sink_service.cc

@@ -61,7 +61,7 @@ ErrorType CreateCastMediaSink(const media_router::DnsSdService& service,
   if (friendly_name.empty())
     return ErrorType::MISSING_FRIENDLY_NAME;
   media_router::MediaSink sink(unique_id, friendly_name,
-                               media_router::MediaSink::IconType::CAST);
+                               media_router::SinkIconType::CAST);
 
   media_router::CastSinkExtraData extra_data;
   extra_data.ip_address = ip_address;

chrome/browser/media/router/discovery/media_sink_service_base_unittest.cc

@@ -27,12 +27,12 @@ media_router::DialSinkExtraData CreateDialSinkExtraData(
 
 std::vector<media_router::MediaSinkInternal> CreateDialMediaSinks() {
   media_router::MediaSink sink1("sink1", "sink_name_1",
-                                media_router::MediaSink::IconType::CAST);
+                                media_router::SinkIconType::CAST);
   media_router::DialSinkExtraData extra_data1 = CreateDialSinkExtraData(
       "model_name1", "192.168.1.1", "https://example1.com");
 
   media_router::MediaSink sink2("sink2", "sink_name_2",
-                                media_router::MediaSink::IconType::CAST);
+                                media_router::SinkIconType::CAST);
   media_router::DialSinkExtraData extra_data2 = CreateDialSinkExtraData(
       "model_name2", "192.168.1.2", "https://example2.com");
 
@@ -101,7 +101,7 @@ TEST_F(MediaSinkServiceBaseTest, TestFetchCompleted_SameSink) {
 TEST_F(MediaSinkServiceBaseTest, TestFetchCompleted_OneNewSink) {
   std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
   std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
-  MediaSink sink3("sink3", "sink_name_3", MediaSink::IconType::CAST);
+  MediaSink sink3("sink3", "sink_name_3", SinkIconType::CAST);
   DialSinkExtraData extra_data3 = CreateDialSinkExtraData(
       "model_name3", "192.168.1.3", "https://example3.com");
   new_sinks.push_back(MediaSinkInternal(sink3, extra_data3));
@@ -125,11 +125,11 @@ TEST_F(MediaSinkServiceBaseTest, TestFetchCompleted_UpdatedOneSink) {
 TEST_F(MediaSinkServiceBaseTest, TestFetchCompleted_Mixed) {
   std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
 
-  MediaSink sink1("sink1", "sink_name_1", MediaSink::IconType::CAST);
+  MediaSink sink1("sink1", "sink_name_1", SinkIconType::CAST);
   DialSinkExtraData extra_data2 = CreateDialSinkExtraData(
       "model_name2", "192.168.1.2", "https://example2.com");
 
-  MediaSink sink3("sink3", "sink_name_3", MediaSink::IconType::CAST);
+  MediaSink sink3("sink3", "sink_name_3", SinkIconType::CAST);
   DialSinkExtraData extra_data3 = CreateDialSinkExtraData(
       "model_name3", "192.168.1.3", "https://example3.com");
 

chrome/browser/media/router/media_sinks_observer_unittest.cc

@@ -17,7 +17,7 @@ TEST(MediaSinksObserverTest, OriginMatching) {
   url::Origin origin{GURL("https://origin.com")};
   std::vector<url::Origin> origin_list({origin});
   std::vector<MediaSink> sink_list;
-  sink_list.push_back(MediaSink("sinkId", "Sink", MediaSink::IconType::CAST));
+  sink_list.push_back(MediaSink("sinkId", "Sink", SinkIconType::CAST));
   MockMediaSinksObserver observer(&router, source, origin);
 
   EXPECT_CALL(observer, OnSinksReceived(SequenceEquals(sink_list)));

chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc

@@ -728,10 +728,8 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
   ProcessEventLoop();
 
   std::vector<MediaSink> expected_sinks;
-  expected_sinks.push_back(
-      MediaSink(kSinkId, kSinkName, MediaSink::IconType::CAST));
-  expected_sinks.push_back(
-      MediaSink(kSinkId2, kSinkName, MediaSink::IconType::CAST));
+  expected_sinks.push_back(MediaSink(kSinkId, kSinkName, SinkIconType::CAST));
+  expected_sinks.push_back(MediaSink(kSinkId2, kSinkName, SinkIconType::CAST));
 
   std::vector<MediaSinkInternal> sinks;
   for (const auto& expected_sink : expected_sinks) {
@@ -1223,7 +1221,7 @@ TEST_F(MediaRouterMojoImplTest, SearchSinks) {
 
 TEST_F(MediaRouterMojoImplTest, ProvideSinks) {
   std::vector<MediaSinkInternal> sinks;
-  MediaSink sink(kSinkId, kSinkName, MediaSink::IconType::CAST);
+  MediaSink sink(kSinkId, kSinkName, SinkIconType::CAST);
   CastSinkExtraData extra_data;
   EXPECT_TRUE(extra_data.ip_address.AssignFromIPLiteral("192.168.1.3"));
   extra_data.capabilities = 2;

chrome/browser/media/router/presentation_media_sinks_observer_unittest.cc

@@ -54,7 +54,7 @@ class PresentationMediaSinksObserverTest : public ::testing::Test {
 
 TEST_F(PresentationMediaSinksObserverTest, AvailableScreens) {
   std::vector<MediaSink> result;
-  result.push_back(MediaSink("sinkId", "Sink", MediaSink::IconType::CAST));
+  result.push_back(MediaSink("sinkId", "Sink", SinkIconType::CAST));
 
   EXPECT_CALL(listener_, OnScreenAvailabilityChanged(
                              blink::mojom::ScreenAvailability::AVAILABLE))
@@ -82,7 +82,7 @@ TEST_F(PresentationMediaSinksObserverTest, ConsecutiveResults) {
 
   // |listener_| should get result since it changed to true.
   std::vector<MediaSink> result;
-  result.push_back(MediaSink("sinkId", "Sink", MediaSink::IconType::CAST));
+  result.push_back(MediaSink("sinkId", "Sink", SinkIconType::CAST));
 
   EXPECT_CALL(listener_, OnScreenAvailabilityChanged(
                              blink::mojom::ScreenAvailability::AVAILABLE))
@@ -91,7 +91,7 @@ TEST_F(PresentationMediaSinksObserverTest, ConsecutiveResults) {
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&listener_));
 
   // Does not propagate result to |listener_| since result is same.
-  result.push_back(MediaSink("sinkId2", "Sink 2", MediaSink::IconType::CAST));
+  result.push_back(MediaSink("sinkId2", "Sink 2", SinkIconType::CAST));
   observer_->OnSinksReceived(result);
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&listener_));
 

chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

@@ -26,8 +26,7 @@ namespace {
 // Helper to create a MediaSink intance.
 media_router::MediaSink MakeSink(const std::string& id,
                                  const std::string& name) {
-  return media_router::MediaSink(id, name,
-                                 media_router::MediaSink::IconType::GENERIC);
+  return media_router::MediaSink(id, name, media_router::SinkIconType::GENERIC);
 }
 
 // Helper to create a MediaRoute instance.

chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

@@ -149,7 +149,7 @@ class MediaRouterUITest : public ChromeRenderViewHostTestHarness {
   }
 
   MediaSink CreateSinkCompatibleWithAllSources() {
-    MediaSink sink("sinkId", "sinkName", MediaSink::GENERIC);
+    MediaSink sink("sinkId", "sinkName", SinkIconType::GENERIC);
     for (auto* observer : media_sinks_observers_)
       observer->OnSinksUpdated({sink}, std::vector<url::Origin>());
     return sink;
@@ -316,19 +316,19 @@ TEST_F(MediaRouterUITest, SortedSinks) {
   std::string sink_id1("sink3");
   std::string sink_name1("B sink");
   MediaSinkWithCastModes sink1(
-      MediaSink(sink_id1, sink_name1, MediaSink::IconType::CAST));
+      MediaSink(sink_id1, sink_name1, SinkIconType::CAST));
   unsorted_sinks.push_back(sink1);
 
   std::string sink_id2("sink1");
   std::string sink_name2("A sink");
   MediaSinkWithCastModes sink2(
-      MediaSink(sink_id2, sink_name2, MediaSink::IconType::CAST));
+      MediaSink(sink_id2, sink_name2, SinkIconType::CAST));
   unsorted_sinks.push_back(sink2);
 
   std::string sink_id3("sink2");
   std::string sink_name3("B sink");
   MediaSinkWithCastModes sink3(
-      MediaSink(sink_id3, sink_name3, MediaSink::IconType::CAST));
+      MediaSink(sink_id3, sink_name3, SinkIconType::CAST));
   unsorted_sinks.push_back(sink3);
 
   // Sorted order is 2, 3, 1.
@@ -343,23 +343,20 @@ TEST_F(MediaRouterUITest, SortSinksByIconType) {
   CreateMediaRouterUI(profile());
   std::vector<MediaSinkWithCastModes> unsorted_sinks;
 
-  MediaSinkWithCastModes sink1(
-      MediaSink("id1", "sink", MediaSink::IconType::HANGOUT));
+  MediaSinkWithCastModes sink1(MediaSink("id1", "sink", SinkIconType::HANGOUT));
   unsorted_sinks.push_back(sink1);
   MediaSinkWithCastModes sink2(
-      MediaSink("id2", "B sink", MediaSink::IconType::CAST_AUDIO_GROUP));
+      MediaSink("id2", "B sink", SinkIconType::CAST_AUDIO_GROUP));
   unsorted_sinks.push_back(sink2);
-  MediaSinkWithCastModes sink3(
-      MediaSink("id3", "sink", MediaSink::IconType::GENERIC));
+  MediaSinkWithCastModes sink3(MediaSink("id3", "sink", SinkIconType::GENERIC));
   unsorted_sinks.push_back(sink3);
   MediaSinkWithCastModes sink4(
-      MediaSink("id4", "A sink", MediaSink::IconType::CAST_AUDIO_GROUP));
+      MediaSink("id4", "A sink", SinkIconType::CAST_AUDIO_GROUP));
   unsorted_sinks.push_back(sink4);
   MediaSinkWithCastModes sink5(
-      MediaSink("id5", "sink", MediaSink::IconType::CAST_AUDIO));
+      MediaSink("id5", "sink", SinkIconType::CAST_AUDIO));
   unsorted_sinks.push_back(sink5);
-  MediaSinkWithCastModes sink6(
-      MediaSink("id6", "sink", MediaSink::IconType::CAST));
+  MediaSinkWithCastModes sink6(MediaSink("id6", "sink", SinkIconType::CAST));
   unsorted_sinks.push_back(sink6);
 
   // Sorted order is CAST, CAST_AUDIO_GROUP "A", CAST_AUDIO_GROUP "B",
@@ -595,7 +592,7 @@ TEST_F(MediaRouterUITest, NotFoundErrorOnCloseWithNoCompatibleSinks) {
   // Send a sink to the UI that is compatible with sources other than the
   // presentation url to cause a NotFoundError.
   std::vector<MediaSink> sinks;
-  sinks.emplace_back("sink id", "sink name", MediaSink::GENERIC);
+  sinks.emplace_back("sink id", "sink name", SinkIconType::GENERIC);
   std::vector<url::Origin> origins;
   for (auto* observer : media_sinks_observers_) {
     if (observer->source().id() != presentation_url.spec()) {
@@ -626,7 +623,7 @@ TEST_F(MediaRouterUITest, AbortErrorOnClose) {
   // Send a sink to the UI that is compatible with the presentation url to avoid
   // a NotFoundError.
   std::vector<MediaSink> sinks;
-  sinks.emplace_back("sink id", "sink name", MediaSink::GENERIC);
+  sinks.emplace_back("sink id", "sink name", SinkIconType::GENERIC);
   std::vector<url::Origin> origins;
   MediaSource::Id presentation_source_id =
       MediaSourceForPresentationUrl(presentation_url).id();

chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc

@@ -62,7 +62,7 @@ std::string GetStringFromDict(const base::DictionaryValue* dict,
 MediaRoute CreateRoute() {
   MediaRoute::Id route_id("routeId123");
   MediaSink::Id sink_id("sinkId123");
-  MediaSink sink(sink_id, "The sink", MediaSink::IconType::CAST);
+  MediaSink sink(sink_id, "The sink", SinkIconType::CAST);
   std::string description("This is a route");
   bool is_local = true;
   bool is_for_display = true;
@@ -76,7 +76,7 @@ MediaSinkWithCastModes CreateMediaSinkWithCastMode(const std::string& sink_id,
                                                    MediaCastMode cast_mode) {
   std::string sink_name("The sink");
   MediaSinkWithCastModes media_sink_with_cast_modes(
-      MediaSink(sink_id, sink_name, MediaSink::IconType::CAST));
+      MediaSink(sink_id, sink_name, SinkIconType::CAST));
   media_sink_with_cast_modes.cast_modes.insert(cast_mode);
 
   return media_sink_with_cast_modes;

chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc

@@ -158,11 +158,11 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
 }
 
 TEST_F(QueryResultManagerTest, MultipleQueries) {
-  MediaSink sink1("sinkId1", "Sink 1", MediaSink::IconType::CAST);
-  MediaSink sink2("sinkId2", "Sink 2", MediaSink::IconType::CAST);
-  MediaSink sink3("sinkId3", "Sink 3", MediaSink::IconType::CAST);
-  MediaSink sink4("sinkId4", "Sink 4", MediaSink::IconType::CAST);
-  MediaSink sink5("sinkId5", "Sink 5", MediaSink::IconType::CAST);
+  MediaSink sink1("sinkId1", "Sink 1", SinkIconType::CAST);
+  MediaSink sink2("sinkId2", "Sink 2", SinkIconType::CAST);
+  MediaSink sink3("sinkId3", "Sink 3", SinkIconType::CAST);
+  MediaSink sink4("sinkId4", "Sink 4", SinkIconType::CAST);
+  MediaSink sink5("sinkId5", "Sink 5", SinkIconType::CAST);
   MediaSource presentation_source1 =
       MediaSourceForPresentationUrl(GURL("http://bar.com"));
   MediaSource presentation_source2 =
@@ -278,10 +278,10 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
 }
 
 TEST_F(QueryResultManagerTest, MultipleUrls) {
-  const MediaSink sink1("sinkId1", "Sink 1", MediaSink::IconType::CAST);
-  const MediaSink sink2("sinkId2", "Sink 2", MediaSink::IconType::CAST);
-  const MediaSink sink3("sinkId3", "Sink 3", MediaSink::IconType::CAST);
-  const MediaSink sink4("sinkId4", "Sink 4", MediaSink::IconType::CAST);
+  const MediaSink sink1("sinkId1", "Sink 1", SinkIconType::CAST);
+  const MediaSink sink2("sinkId2", "Sink 2", SinkIconType::CAST);
+  const MediaSink sink3("sinkId3", "Sink 3", SinkIconType::CAST);
+  const MediaSink sink4("sinkId4", "Sink 4", SinkIconType::CAST);
   const MediaSource source_a(
       MediaSourceForPresentationUrl(GURL("http://urlA.com")));
   const MediaSource source_b(

chrome/common/media_router/discovery/media_sink_internal.h

@@ -84,9 +84,7 @@ class MediaSinkInternal {
     sink_.set_description(description);
   }
   void set_domain(const std::string& domain) { sink_.set_domain(domain); }
-  void set_icon_type(MediaSink::IconType icon_type) {
-    sink_.set_icon_type(icon_type);
-  }
+  void set_icon_type(SinkIconType icon_type) { sink_.set_icon_type(icon_type); }
 
   void set_sink(const MediaSink& sink);
   const MediaSink& sink() const { return sink_; }

chrome/common/media_router/discovery/media_sink_internal_unittest.cc

@@ -57,7 +57,7 @@ TEST(MediaSinkInternalTest, TestIsValidSinkId) {
 }
 
 TEST(MediaSinkInternalTest, TestConstructorAndAssignment) {
-  MediaSink sink(kSinkId, kSinkName, MediaSink::IconType::CAST);
+  MediaSink sink(kSinkId, kSinkName, SinkIconType::CAST);
   DialSinkExtraData dial_extra_data = CreateDialSinkExtraData();
   CastSinkExtraData cast_extra_data = CreateCastSinkExtraData();
 
@@ -94,7 +94,7 @@ TEST(MediaSinkInternalTest, TestConstructorAndAssignment) {
 }
 
 TEST(MediaSinkInternalTest, TestSetExtraData) {
-  MediaSink sink(kSinkId, kSinkName, MediaSink::IconType::CAST);
+  MediaSink sink(kSinkId, kSinkName, SinkIconType::CAST);
   DialSinkExtraData dial_extra_data = CreateDialSinkExtraData();
   CastSinkExtraData cast_extra_data = CreateCastSinkExtraData();
 

chrome/common/media_router/media_sink.cc

@@ -11,7 +11,7 @@ namespace media_router {
 
 MediaSink::MediaSink(const MediaSink::Id& sink_id,
                      const std::string& name,
-                     const MediaSink::IconType icon_type)
+                     SinkIconType icon_type)
     : sink_id_(sink_id), name_(name), icon_type_(icon_type) {}
 
 MediaSink::MediaSink(const MediaSink& other) = default;

chrome/common/media_router/media_sink.h

@@ -16,27 +16,27 @@ class Collator;
 
 namespace media_router {
 
+// IconTypes are listed in the order in which sinks should be sorted.
+// The order must stay in sync with
+// chrome/browser/resources/media_router/media_router_data.js.
+enum SinkIconType {
+  CAST,
+  CAST_AUDIO_GROUP,
+  CAST_AUDIO,
+  MEETING,
+  HANGOUT,
+  GENERIC
+};
+
 // Represents a sink to which media can be routed.
 // TODO(zhaobin): convert MediaSink into a struct.
 class MediaSink {
  public:
   using Id = std::string;
 
-  // IconTypes are listed in the order in which sinks should be sorted.
-  // The order must stay in sync with
-  // chrome/browser/resources/media_router/media_router_data.js.
-  enum IconType {
-    CAST,
-    CAST_AUDIO_GROUP,
-    CAST_AUDIO,
-    MEETING,
-    HANGOUT,
-    GENERIC
-  };
-
   MediaSink(const MediaSink::Id& sink_id,
             const std::string& name,
-            const IconType icon_type);
+            const SinkIconType icon_type);
   MediaSink(const MediaSink& other);
   MediaSink();
 
@@ -58,8 +58,8 @@ class MediaSink {
   void set_domain(const std::string& domain) { domain_ = domain; }
   const base::Optional<std::string>& domain() const { return domain_; }
 
-  void set_icon_type(IconType icon_type) { icon_type_ = icon_type; }
-  IconType icon_type() const { return icon_type_; }
+  void set_icon_type(SinkIconType icon_type) { icon_type_ = icon_type; }
+  SinkIconType icon_type() const { return icon_type_; }
 
   // This method only compares IDs.
   bool Equals(const MediaSink& other) const;
@@ -94,7 +94,7 @@ class MediaSink {
   base::Optional<std::string> domain_;
 
   // The type of icon that corresponds with the MediaSink.
-  IconType icon_type_ = IconType::GENERIC;
+  SinkIconType icon_type_ = SinkIconType::GENERIC;
 };
 
 }  // namespace media_router

chrome/common/media_router/media_sink_unittest.cc

@@ -9,22 +9,22 @@
 namespace media_router {
 
 TEST(MediaSinkTest, Equals) {
-  MediaSink sink1("sinkId", "Sink", MediaSink::CAST);
+  MediaSink sink1("sinkId", "Sink", SinkIconType::CAST);
 
   // No name, same as sink1.
-  MediaSink sink2("sinkId", "", MediaSink::CAST);
+  MediaSink sink2("sinkId", "", SinkIconType::CAST);
   EXPECT_TRUE(sink1.Equals(sink2));
 
   // Sink name is different from sink1's.
-  MediaSink sink3("sinkId", "Other Sink", MediaSink::CAST);
+  MediaSink sink3("sinkId", "Other Sink", SinkIconType::CAST);
   EXPECT_TRUE(sink1.Equals(sink3));
 
   // Sink ID is diffrent from sink1's.
-  MediaSink sink4("otherSinkId", "Sink", MediaSink::CAST);
+  MediaSink sink4("otherSinkId", "Sink", SinkIconType::CAST);
   EXPECT_FALSE(sink1.Equals(sink4));
 
   // Sink icon type is diffrent from sink1's.
-  MediaSink sink5("otherSinkId", "Sink", MediaSink::GENERIC);
+  MediaSink sink5("otherSinkId", "Sink", SinkIconType::GENERIC);
   EXPECT_FALSE(sink1.Equals(sink5));
 }
 

chrome/common/media_router/mojo/media_router.mojom

@@ -12,17 +12,17 @@ import "net/interfaces/ip_address.mojom";
 import "url/mojo/origin.mojom";
 import "url/mojo/url.mojom";
 
+enum SinkIconType {
+  CAST,
+  CAST_AUDIO,
+  CAST_AUDIO_GROUP,
+  MEETING,
+  HANGOUT,
+  GENERIC
+};
+
 // Represents an output sink to which media can be routed.
 struct MediaSink {
-  enum IconType {
-    CAST,
-    CAST_AUDIO,
-    CAST_AUDIO_GROUP,
-    MEETING,
-    HANGOUT,
-    GENERIC
-  };
-
   // The sink identifier, e.g. "rs71w7mFzYLFlabir_qO4NHl6SUc."
   string sink_id;
   // The human-readable name, e.g. "Janet's Chromecast".
@@ -32,7 +32,7 @@ struct MediaSink {
   // Optional domain of the sink if this sink is associated with an identity.
   string? domain;
   // The type of icon to show in the UI for this media sink.
-  IconType icon_type;
+  SinkIconType icon_type;
   // This is currently only set by MediaRouter in OnSinksDiscovered().
   MediaSinkExtraData? extra_data;
 };

chrome/common/media_router/mojo/media_router_struct_traits.cc

@@ -93,7 +93,7 @@ bool StructTraits<media_router::mojom::MediaSinkDataView,
   if (domain)
     out->set_domain(*domain);
 
-  media_router::MediaSink::IconType icon_type;
+  media_router::SinkIconType icon_type;
   if (!data.ReadIconType(&icon_type))
     return false;
 

chrome/common/media_router/mojo/media_router_struct_traits.h

@@ -248,48 +248,48 @@ struct StructTraits<media_router::mojom::IssueDataView,
 // MediaSink
 
 template <>
-struct EnumTraits<media_router::mojom::MediaSink::IconType,
-                  media_router::MediaSink::IconType> {
-  static media_router::mojom::MediaSink::IconType ToMojom(
-      media_router::MediaSink::IconType icon_type) {
+struct EnumTraits<media_router::mojom::SinkIconType,
+                  media_router::SinkIconType> {
+  static media_router::mojom::SinkIconType ToMojom(
+      media_router::SinkIconType icon_type) {
     switch (icon_type) {
-      case media_router::MediaSink::CAST:
-        return media_router::mojom::MediaSink::IconType::CAST;
-      case media_router::MediaSink::CAST_AUDIO:
-        return media_router::mojom::MediaSink::IconType::CAST_AUDIO;
-      case media_router::MediaSink::CAST_AUDIO_GROUP:
-        return media_router::mojom::MediaSink::IconType::CAST_AUDIO_GROUP;
-      case media_router::MediaSink::HANGOUT:
-        return media_router::mojom::MediaSink::IconType::HANGOUT;
-      case media_router::MediaSink::MEETING:
-        return media_router::mojom::MediaSink::IconType::MEETING;
-      case media_router::MediaSink::GENERIC:
-        return media_router::mojom::MediaSink::IconType::GENERIC;
+      case media_router::SinkIconType::CAST:
+        return media_router::mojom::SinkIconType::CAST;
+      case media_router::SinkIconType::CAST_AUDIO:
+        return media_router::mojom::SinkIconType::CAST_AUDIO;
+      case media_router::SinkIconType::CAST_AUDIO_GROUP:
+        return media_router::mojom::SinkIconType::CAST_AUDIO_GROUP;
+      case media_router::SinkIconType::HANGOUT:
+        return media_router::mojom::SinkIconType::HANGOUT;
+      case media_router::SinkIconType::MEETING:
+        return media_router::mojom::SinkIconType::MEETING;
+      case media_router::SinkIconType::GENERIC:
+        return media_router::mojom::SinkIconType::GENERIC;
     }
     NOTREACHED() << "Unknown sink icon type " << static_cast<int>(icon_type);
-    return media_router::mojom::MediaSink::IconType::GENERIC;
+    return media_router::mojom::SinkIconType::GENERIC;
   }
 
-  static bool FromMojom(media_router::mojom::MediaSink::IconType input,
-                        media_router::MediaSink::IconType* output) {
+  static bool FromMojom(media_router::mojom::SinkIconType input,
+                        media_router::SinkIconType* output) {
     switch (input) {
-      case media_router::mojom::MediaSink::IconType::CAST:
-        *output = media_router::MediaSink::CAST;
+      case media_router::mojom::SinkIconType::CAST:
+        *output = media_router::SinkIconType::CAST;
         return true;
-      case media_router::mojom::MediaSink::IconType::CAST_AUDIO:
-        *output = media_router::MediaSink::CAST_AUDIO;
+      case media_router::mojom::SinkIconType::CAST_AUDIO:
+        *output = media_router::SinkIconType::CAST_AUDIO;
         return true;
-      case media_router::mojom::MediaSink::IconType::CAST_AUDIO_GROUP:
-        *output = media_router::MediaSink::CAST_AUDIO_GROUP;
+      case media_router::mojom::SinkIconType::CAST_AUDIO_GROUP:
+        *output = media_router::SinkIconType::CAST_AUDIO_GROUP;
         return true;
-      case media_router::mojom::MediaSink::IconType::HANGOUT:
-        *output = media_router::MediaSink::HANGOUT;
+      case media_router::mojom::SinkIconType::HANGOUT:
+        *output = media_router::SinkIconType::HANGOUT;
         return true;
-      case media_router::mojom::MediaSink::IconType::MEETING:
-        *output = media_router::MediaSink::MEETING;
+      case media_router::mojom::SinkIconType::MEETING:
+        *output = media_router::SinkIconType::MEETING;
         return true;
-      case media_router::mojom::MediaSink::IconType::GENERIC:
-        *output = media_router::MediaSink::GENERIC;
+      case media_router::mojom::SinkIconType::GENERIC:
+        *output = media_router::SinkIconType::GENERIC;
         return true;
     }
     return false;
@@ -322,7 +322,7 @@ struct StructTraits<media_router::mojom::MediaSinkDataView,
     return sink_internal.sink().domain();
   }
 
-  static media_router::MediaSink::IconType icon_type(
+  static media_router::SinkIconType icon_type(
       const media_router::MediaSinkInternal& sink_internal) {
     return sink_internal.sink().icon_type();
   }

chrome/common/media_router/mojo/media_router_struct_traits_unittest.cc

@@ -44,7 +44,7 @@ class MediaRouterStructTraitsTest
 TEST_F(MediaRouterStructTraitsTest, DialMediaSink) {
   MediaSink::Id sink_id("sinkId123");
   std::string sink_name("The sink");
-  MediaSink::IconType icon_type(MediaSink::IconType::CAST);
+  SinkIconType icon_type(SinkIconType::CAST);
   std::string ip_address("192.168.1.2");
   std::string model_name("model name");
   GURL app_url("https://example.com");
@@ -67,7 +67,7 @@ TEST_F(MediaRouterStructTraitsTest, DialMediaSink) {
 TEST_F(MediaRouterStructTraitsTest, CastMediaSink) {
   MediaSink::Id sink_id("sinkId123");
   std::string sink_name("The sink");
-  MediaSink::IconType icon_type(MediaSink::IconType::CAST);
+  SinkIconType icon_type(SinkIconType::CAST);
   std::string ip_address("192.168.1.2");
   std::string model_name("model name");
 
@@ -90,7 +90,7 @@ TEST_F(MediaRouterStructTraitsTest, CastMediaSink) {
 TEST_F(MediaRouterStructTraitsTest, GenericMediaSink) {
   MediaSink::Id sink_id("sinkId123");
   std::string sink_name("The sink");
-  MediaSink::IconType icon_type(MediaSink::IconType::CAST);
+  SinkIconType icon_type(SinkIconType::CAST);
 
   MediaSink sink(sink_id, sink_name, icon_type);
   MediaSinkInternal generic_sink;