| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/aura/test/aura_mus_test_base.h" | 5 #include "ui/aura/test/aura_mus_test_base.h" |
| 6 | 6 |
| 7 namespace aura { | 7 namespace aura { |
| 8 namespace test { | 8 namespace test { |
| 9 | 9 |
| 10 AuraMusWmTestBase::AuraMusWmTestBase() {} | 10 AuraMusWmTestBase::AuraMusWmTestBase() {} |
| 11 | 11 |
| 12 AuraMusWmTestBase::~AuraMusWmTestBase() {} | 12 AuraMusWmTestBase::~AuraMusWmTestBase() {} |
| 13 | 13 |
| 14 void AuraMusWmTestBase::SetUp() { | 14 void AuraMusWmTestBase::SetUp() { |
| 15 EnableMus(); | 15 EnableMusWithTestWindowTree(); |
| 16 AuraTestBase::SetUp(); | 16 AuraTestBase::SetUp(); |
| 17 } | 17 } |
| 18 | 18 |
| 19 AuraMusClientTestBase::AuraMusClientTestBase() {} | 19 AuraMusClientTestBase::AuraMusClientTestBase() {} |
| 20 | 20 |
| 21 AuraMusClientTestBase::~AuraMusClientTestBase() {} | 21 AuraMusClientTestBase::~AuraMusClientTestBase() {} |
| 22 | 22 |
| 23 void AuraMusClientTestBase::SetUp() { | 23 void AuraMusClientTestBase::SetUp() { |
| 24 EnableMus(); | 24 EnableMusWithTestWindowTree(); |
| 25 set_window_manager_delegate(nullptr); | 25 set_window_manager_delegate(nullptr); |
| 26 AuraTestBase::SetUp(); | 26 AuraTestBase::SetUp(); |
| 27 } | 27 } |
| 28 | 28 |
| 29 } // namespace test | 29 } // namespace test |
| 30 } // namespace aura | 30 } // namespace aura |
| OLD | NEW |