Index: ui/aura/test/aura_mus_test_base.cc |
diff --git a/base/test/scoped_command_line.cc b/ui/aura/test/aura_mus_test_base.cc |
similarity index 31% |
copy from base/test/scoped_command_line.cc |
copy to ui/aura/test/aura_mus_test_base.cc |
index c74d243f4488e9ea0cf4609459a9f34834497649..f16074942ec77a4395c9e796ecd5e203a94a7aee 100644 |
--- a/base/test/scoped_command_line.cc |
+++ b/ui/aura/test/aura_mus_test_base.cc |
@@ -2,21 +2,29 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/test/scoped_command_line.h" |
+#include "ui/aura/test/aura_mus_test_base.h" |
-namespace base { |
+namespace aura { |
namespace test { |
-ScopedCommandLine::ScopedCommandLine() |
- : original_command_line_(*base::CommandLine::ForCurrentProcess()) {} |
+AuraMusWmTestBase::AuraMusWmTestBase() {} |
-ScopedCommandLine::~ScopedCommandLine() { |
- *base::CommandLine::ForCurrentProcess() = original_command_line_; |
+AuraMusWmTestBase::~AuraMusWmTestBase() {} |
+ |
+void AuraMusWmTestBase::SetUp() { |
+ EnableMus(); |
+ AuraTestBase::SetUp(); |
} |
-CommandLine* ScopedCommandLine::GetProcessCommandLine() { |
- return base::CommandLine::ForCurrentProcess(); |
+AuraMusClientTestBase::AuraMusClientTestBase() {} |
+ |
+AuraMusClientTestBase::~AuraMusClientTestBase() {} |
+ |
+void AuraMusClientTestBase::SetUp() { |
+ EnableMus(); |
+ set_window_manager_delegate(nullptr); |
+ AuraTestBase::SetUp(); |
} |
} // namespace test |
-} // namespace base |
+} // namespace aura |