[MR] Add description field to MediaSink.

chrome/browser/media/router/media_sink.h

Index: chrome/browser/media/router/media_sink.h
diff --git a/chrome/browser/media/router/media_sink.h b/chrome/browser/media/router/media_sink.h
index 23df7b1992ee95cdcbe57100b6b161b9d174dd46..44d2ed5848505834823911ac161c7a7ec4ddddc9 100644
--- a/chrome/browser/media/router/media_sink.h
+++ b/chrome/browser/media/router/media_sink.h
@@ -30,19 +30,26 @@ class MediaSink {
 
   const MediaSink::Id& id() const { return sink_id_; }
   const std::string& name() const { return name_; }
-  MediaSink::IconType icon_type() const { return icon_type_; }
+  void set_description(const std::string& description) {
+    description_ = description;
+  }
+  const std::string& description() const { return description_; }
+  IconType icon_type() const { return icon_type_; }
 
   bool Equals(const MediaSink& other) const;
-  bool Empty() const;
 
  private:
   // Unique identifier for the MediaSink.
   MediaSink::Id sink_id_;
+
   // Descriptive name of the MediaSink.
-  // Optional, can use an empty string if no sink name is available.

[apacible, 2015/11/25 23:05:41]

Is |name_| no longer optional?

[imcheng, 2015/12/01 19:29:27]

No. It was optional before because MR used to have a full MediaSink in a
MediaRoute object, but in MRPM a Route object only contained a sink id so we had
to use an empty string as name when converting from MRPM to MR. This is no
longer the case because MR MediaRoute only contains a sink id now.

   std::string name_;
+
+  // Optional description of the MediaSink.
+  std::string description_;
+
   // The type of icon that corresponds with the MediaSink.
-  MediaSink::IconType icon_type_;
+  IconType icon_type_;
 };
 
 }  // namespace media_router