Makes it possible for clients to directly create WindowTreeHostMus

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"
 
@@ skipping 147 matching lines @@
 
 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(Window* root) {}
+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,
                                           Window* target) {}
 
@@ skipping 12 matching lines @@
 
 Window* AuraTestBase::OnWmCreateTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   return new Window(nullptr);
 }
 
 void AuraTestBase::OnWmClientJankinessChanged(
     const std::set<Window*>& client_windows,
     bool janky) {}
 
-void AuraTestBase::OnWmNewDisplay(Window* window,
-                                  const display::Display& display) {}
+void AuraTestBase::OnWmNewDisplay(
+    std::unique_ptr<WindowTreeHostMus> window_tree_host,
+    const display::Display& display) {}

[sadrul, 2016/11/02 16:03:04]

Is it OK to not keep the WTHMus alive?

[sky, 2016/11/02 16:53:23]

It should be fine. But I'm assuming when a test wants to test this code path it
will subclass. Or it could be I change this. I'll know once I get further
along...

 
 void AuraTestBase::OnWmDisplayRemoved(Window* window) {}
 
 void AuraTestBase::OnWmDisplayModified(const display::Display& display) {}
 
 ui::mojom::EventResult AuraTestBase::OnAccelerator(uint32_t id,
                                                    const ui::Event& event) {
   return ui::mojom::EventResult::HANDLED;
 }
 
@@ skipping 25 matching lines @@
 
 void AuraTestBaseWithType::SetUp() {
   DCHECK(!setup_called_);
   setup_called_ = true;
   ConfigureBackend(GetParam());
   AuraTestBase::SetUp();
 }
 
 }  // namespace test
 }  // namespace aura