Add gfx::ImageSkia and icon support to aura::PropertyConverter.

ash/mus/window_manager.cc

Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 006ef0b168b5205160c9eba45081960eb32cece4..21d30e96d708e1a837a5d4a4e57bdfec422a4a1b 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -317,11 +317,12 @@ bool WindowManager::OnWmSetProperty(
     const std::string& name,
     std::unique_ptr<std::vector<uint8_t>>* new_data) {
   // TODO(sky): constrain this to set of keys we know about, and allowed values.
-  return name == ui::mojom::WindowManager::kShowState_Property ||
+  return name == ui::mojom::WindowManager::kAppIcon_Property ||
+         name == ui::mojom::WindowManager::kShowState_Property ||
          name == ui::mojom::WindowManager::kPreferredSize_Property ||
          name == ui::mojom::WindowManager::kResizeBehavior_Property ||
          name == ui::mojom::WindowManager::kShelfItemType_Property ||
-         name == ui::mojom::WindowManager::kWindowAppIcon_Property ||
+         name == ui::mojom::WindowManager::kWindowIcon_Property ||
          name == ui::mojom::WindowManager::kWindowTitle_Property;
 }