Adds DesktopWindowTreeHostMus

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"
@@ skipping 92 matching lines @@
   gesture_config->set_two_finger_tap_enabled(true);
   gesture_config->set_velocity_tracker_strategy(
       ui::VelocityTracker::Strategy::LSQ2_RESTRICTED);
 
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   helper_.reset(new AuraTestHelper(&message_loop_));
-  if (use_mus_)
-    helper_->EnableMus(window_tree_client_delegate_, window_manager_delegate_);
+  if (use_mus_) {
+    helper_->EnableMusWithTestWindowTree(window_tree_client_delegate_,
+                                         window_manager_delegate_);
+  }
   helper_->SetUp(context_factory);
 }
 
 void AuraTestBase::TearDown() {
   teardown_called_ = true;
 
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunAllPendingInMessageLoop();
 
   helper_->TearDown();
   ui::TerminateContextFactoryForTests();
   ui::ShutdownInputMethodForTesting();
   testing::Test::TearDown();
 }
 
 Window* AuraTestBase::CreateNormalWindow(int id, Window* parent,
                                          WindowDelegate* delegate) {
   Window* window = new Window(
       delegate ? delegate :
       test::TestWindowDelegate::CreateSelfDestroyingDelegate());
   window->set_id(id);
   window->Init(ui::LAYER_TEXTURED);
   parent->AddChild(window);
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   window->Show();
   return window;
 }
 
-void AuraTestBase::EnableMus() {
+void AuraTestBase::EnableMusWithTestWindowTree() {
   DCHECK(!setup_called_);
   use_mus_ = true;
 }
 
 void AuraTestBase::ConfigureBackend(BackendType type) {
   if (type == BackendType::MUS)
-    EnableMus();
+    EnableMusWithTestWindowTree();
 }
 
 void AuraTestBase::RunAllPendingInMessageLoop() {
   helper_->RunAllPendingInMessageLoop();
 }
 
 void AuraTestBase::ParentWindow(Window* window) {
   client::ParentWindowWithContext(window, root_window(), gfx::Rect());
 }
 
@@ skipping 88 matching lines @@
 
 void AuraTestBaseWithType::SetUp() {
   DCHECK(!setup_called_);
   setup_called_ = true;
   ConfigureBackend(GetParam());
   AuraTestBase::SetUp();
 }
 
 }  // namespace test
 }  // namespace aura