Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0

chrome/browser/media/webrtc/window_icon_util_ozone.cc

Index: chrome/browser/media/webrtc/window_icon_util_ozone.cc
diff --git a/chrome/browser/media/webrtc/window_icon_util_chromeos.cc b/chrome/browser/media/webrtc/window_icon_util_ozone.cc
similarity index 59%
copy from chrome/browser/media/webrtc/window_icon_util_chromeos.cc
copy to chrome/browser/media/webrtc/window_icon_util_ozone.cc
index 9c9130fafce47d08f45e7891f2b18b71084da2cb..f519648c48990fba693d2d58567905b25e9ce233 100644
--- a/chrome/browser/media/webrtc/window_icon_util_chromeos.cc
+++ b/chrome/browser/media/webrtc/window_icon_util_ozone.cc
@@ -6,16 +6,12 @@
 
 #include "content/public/browser/desktop_media_id.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/window.h"
 
 gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {
   DCHECK_EQ(content::DesktopMediaID::TYPE_WINDOW, id.type);

[rjkroege, 2016/10/25 20:10:39]

forthcoming changes in the mash/aura client code should make this unnecessary?

-  aura::Window* window = content::DesktopMediaID::GetAuraWindowById(id);
-  if (!window)
-    return gfx::ImageSkia();
-
-  const gfx::ImageSkia* icon_image_ptr =
-      window->GetProperty(aura::client::kWindowIconKey);
-
-  return icon_image_ptr ? *icon_image_ptr : gfx::ImageSkia();
+  // TODO(tonikitoo): can we make the implementation of
+  // chrome/browser/media/webrtc/window_icon_util_chromeos.cc generic
+  // enough so we can reuse it here?
+  NOTIMPLEMENTED();
+  return gfx::ImageSkia();
 }