| 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/views/mus/views_mus_test_suite.h" | 5 #include "ui/views/mus/views_mus_test_suite.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 std::unique_ptr<shell::BackgroundShell> background_shell_; | 117 std::unique_ptr<shell::BackgroundShell> background_shell_; |
| 118 std::unique_ptr<shell::ShellConnection> shell_connection_; | 118 std::unique_ptr<shell::ShellConnection> shell_connection_; |
| 119 std::unique_ptr<DefaultShellClient> shell_client_; | 119 std::unique_ptr<DefaultShellClient> shell_client_; |
| 120 std::unique_ptr<shell::Connector> shell_connector_; | 120 std::unique_ptr<shell::Connector> shell_connector_; |
| 121 shell::Identity shell_identity_; | 121 shell::Identity shell_identity_; |
| 122 | 122 |
| 123 DISALLOW_COPY_AND_ASSIGN(ShellConnection); | 123 DISALLOW_COPY_AND_ASSIGN(ShellConnection); |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 ViewsMusTestSuite::ViewsMusTestSuite(int argc, char** argv) | 126 ViewsMusTestSuite::ViewsMusTestSuite(int argc, char** argv) |
| 127 : ViewTestSuite(argc, argv) {} | 127 : ViewsTestSuite(argc, argv) {} |
| 128 | 128 |
| 129 ViewsMusTestSuite::~ViewsMusTestSuite() {} | 129 ViewsMusTestSuite::~ViewsMusTestSuite() {} |
| 130 | 130 |
| 131 void ViewsMusTestSuite::Initialize() { | 131 void ViewsMusTestSuite::Initialize() { |
| 132 PlatformTestHelper::SetIsMus(); | 132 PlatformTestHelper::SetIsMus(); |
| 133 ViewTestSuite::Initialize(); | 133 ViewsTestSuite::Initialize(); |
| 134 shell_connections_.reset(new ShellConnection); | 134 shell_connections_.reset(new ShellConnection); |
| 135 } | 135 } |
| 136 | 136 |
| 137 void ViewsMusTestSuite::Shutdown() { | 137 void ViewsMusTestSuite::Shutdown() { |
| 138 shell_connections_.reset(); | 138 shell_connections_.reset(); |
| 139 ViewTestSuite::Shutdown(); | 139 ViewsTestSuite::Shutdown(); |
| 140 } | 140 } |
| 141 | 141 |
| 142 } // namespace views | 142 } // namespace views |
| OLD | NEW |