Converts ash to use aura-mus

ui/views/mus/native_widget_mus_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/tests/window_tree_client_private.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/mus/property_converter.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
@@ skipping 586 matching lines @@
   window->AddObserver(&observer);
 
   std::unique_ptr<Widget> widget(new Widget());
   observer.set_widget(widget.get());
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = initial_bounds();
   params.native_widget = new NativeWidgetMus(
       widget.get(), window, ui::mojom::CompositorFrameSinkType::DEFAULT);
   widget->Init(params);
-  window->SetSharedProperty<int32_t>(
+  window->SetSharedProperty<aura::PropertyConverter::PrimitiveType>(
       ui::mojom::WindowManager::kShowState_Property,
-      static_cast<uint32_t>(ui::mojom::ShowState::MAXIMIZED));
+      static_cast<aura::PropertyConverter::PrimitiveType>(
+          ui::mojom::ShowState::MAXIMIZED));
   EXPECT_TRUE(widget->IsMaximized());
 }
 
 // This test is to ensure that when initializing a widget with InitParams.parent
 // set to another widget's aura::Window, the ui::Window of the former widget is
 // added as a child to the ui::Window of the latter widget.
 TEST_F(NativeWidgetMusTest, InitNativeWidgetParentsUIWindow) {
   ASSERT_TRUE(WindowManagerConnection::Exists());
 
   ui::Window* parent_window = WindowManagerConnection::Get()->NewTopLevelWindow(
@@ skipping 34 matching lines @@
   not_child_params.name = "Not Child Widget";
   not_child_params.native_widget =
       new NativeWidgetMus(not_child_widget.get(), not_child_window,
                           ui::mojom::CompositorFrameSinkType::DEFAULT);
   not_child_widget->Init(not_child_params);
 
   EXPECT_NE(not_child_window->parent(), parent_window);
 }
 
 }  // namespace views