Add CombinedDesktopMediaList class

content/public/browser/desktop_media_id.cc

Index: content/public/browser/desktop_media_id.cc
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
index 63c2cbf3c61f6a74824511d2544e4bca809c535e..8e74dcc866c3f4ed41addea3fa3b27848a3e2782 100644
--- a/content/public/browser/desktop_media_id.cc
+++ b/content/public/browser/desktop_media_id.cc
@@ -102,7 +102,7 @@ bool DesktopMediaID::operator<(const DesktopMediaID& other) const {
          std::tie(other.type, other.id, other.aura_id, other.web_contents_id);
 #else
   return std::tie(type, id, web_contents_id) <
-         std::tie(other.type, other.id, web_contents_id);
+         std::tie(other.type, other.id, other.web_contents_id);

[Sergey Ulanov, 2016/01/27 00:36:31]

this is not related to this CL. I don't mind keeping it here, but mention this
fix in the description.

[GeorgeZ, 2016/01/27 22:57:17]

Revert this change and put it into another CL.

 #endif
 }