Expand aura::PropertyConverter support.

ui/aura/test/aura_test_base.cc

 // 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.
 
 #include "ui/aura/test/aura_test_base.h"
 
 #include "ui/aura/client/window_parenting_client.h"
-#include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace aura {
 namespace test {
 
 AuraTestBase::AuraTestBase()
     : window_manager_delegate_(this), window_tree_client_delegate_(this) {}
 
 AuraTestBase::~AuraTestBase() {
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called super class's TearDown";
 }
 
 void AuraTestBase::SetUp() {
   setup_called_ = true;
   testing::Test::SetUp();
-  if (!property_converter_)
-    property_converter_ = base::MakeUnique<PropertyConverter>();
   // ContentTestSuiteBase might have already initialized
   // MaterialDesignController in unit_tests suite.
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   ui::MaterialDesignController::Initialize();
   ui::InitializeInputMethodForTesting();
   ui::GestureConfiguration* gesture_config =
       ui::GestureConfiguration::GetInstance();
   // Changing the parameters for gesture recognition shouldn't cause
   // tests to fail, so we use a separate set of parameters for unit
   // testing.
@@ skipping 86 matching lines @@
   ui::EventDispatchDetails details =
       event_processor()->OnEventFromSource(event);
   CHECK(!details.dispatcher_destroyed);
   return event->handled();
 }
 
 ui::mojom::WindowTreeClient* AuraTestBase::window_tree_client() {
   return helper_->window_tree_client();
 }
 
-void AuraTestBase::SetPropertyConverter(
-    std::unique_ptr<PropertyConverter> helper) {
-  property_converter_ = std::move(helper);
-}
-
 void AuraTestBase::OnEmbed(
     std::unique_ptr<WindowTreeHostMus> window_tree_host) {}
 
 void AuraTestBase::OnUnembed(Window* root) {}
 
 void AuraTestBase::OnEmbedRootDestroyed(Window* root) {}
 
 void AuraTestBase::OnLostConnection(WindowTreeClient* client) {}
 
 void AuraTestBase::OnPointerEventObserved(const ui::PointerEvent& event,
@@ skipping 43 matching lines @@
     const gfx::Point& cursor_location,
     const base::Callback<void(bool)>& on_done) {}
 
 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {}
 
 client::CaptureClient* AuraTestBase::GetCaptureClient() {
   return helper_->capture_client();
 }
 
 PropertyConverter* AuraTestBase::GetPropertyConverter() {
-  return property_converter_.get();
+  return &property_converter_;
 }
 
 AuraTestBaseWithType::AuraTestBaseWithType() {}
 
 AuraTestBaseWithType::~AuraTestBaseWithType() {
   DCHECK(setup_called_);
 }
 
 void AuraTestBaseWithType::SetUp() {
   DCHECK(!setup_called_);
   setup_called_ = true;
   ConfigureBackend(GetParam());
   AuraTestBase::SetUp();
 }
 
 }  // namespace test
 }  // namespace aura