Expand aura::PropertyConverter support.

ui/aura/test/aura_test_base.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
 #define UI_AURA_TEST_AURA_TEST_BASE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/test/aura_test_helper.h"
 
 namespace ui {
 namespace mojom {
 class WindowTreeClient;
 }
 }
 
@@ skipping 54 matching lines @@
   WindowTreeHost* host() { return helper_->host(); }
   ui::EventProcessor* event_processor() { return helper_->event_processor(); }
   TestScreen* test_screen() { return helper_->test_screen(); }
 
   TestWindowTree* window_tree() { return helper_->window_tree(); }
   WindowTreeClient* window_tree_client_impl() {
     return helper_->window_tree_client();
   }
   ui::mojom::WindowTreeClient* window_tree_client();
 
-  // Resets the PropertyConverter.
-  void SetPropertyConverter(std::unique_ptr<PropertyConverter> helper);
-
   // WindowTreeClientDelegate:
   void OnEmbed(std::unique_ptr<WindowTreeHostMus> window_tree_host) override;
   void OnUnembed(Window* root) override;
   void OnEmbedRootDestroyed(Window* root) override;
   void OnLostConnection(WindowTreeClient* client) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               Window* target) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(WindowManagerClient* client) override;
@@ skipping 22 matching lines @@
 
  private:
   // Only used for mus. Both are are initialized to this, but may be reset.
   WindowManagerDelegate* window_manager_delegate_;
   WindowTreeClientDelegate* window_tree_client_delegate_;
 
   bool use_mus_ = false;
   bool setup_called_ = false;
   bool teardown_called_ = false;
   base::MessageLoopForUI message_loop_;
-  std::unique_ptr<PropertyConverter> property_converter_;
+  PropertyConverter property_converter_;
   std::unique_ptr<AuraTestHelper> helper_;
   std::unique_ptr<WindowTreeHostMus> window_tree_host_mus_;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
 };
 
 // Use as a base class for tests that want to target both backends.
 class AuraTestBaseWithType : public AuraTestBase,
                              public ::testing::WithParamInterface<BackendType> {
  public:
   AuraTestBaseWithType();
   ~AuraTestBaseWithType() override;
 
   // AuraTestBase:
   void SetUp() override;
 
  private:
   bool setup_called_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_AURA_TEST_BASE_H_