| 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 #ifndef MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ | 5 #ifndef MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ |
| 6 #define MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ | 6 #define MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "mojo/shell/public/cpp/connector.h" | 10 #include "mojo/shell/public/cpp/connector.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 scoped_ptr<ShellConnection> shell_connection_; | 93 scoped_ptr<ShellConnection> shell_connection_; |
| 94 | 94 |
| 95 // See constructor. | 95 // See constructor. |
| 96 std::string test_name_; | 96 std::string test_name_; |
| 97 | 97 |
| 98 Connector* connector_ = nullptr; | 98 Connector* connector_ = nullptr; |
| 99 std::string initialize_name_; | 99 std::string initialize_name_; |
| 100 std::string initialize_userid_ = shell::mojom::kInheritUserID; | 100 std::string initialize_userid_ = shell::mojom::kInheritUserID; |
| 101 uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID; | 101 uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID; |
| 102 | 102 |
| 103 base::Closure initialize_called_; |
| 104 |
| 103 DISALLOW_COPY_AND_ASSIGN(ShellTest); | 105 DISALLOW_COPY_AND_ASSIGN(ShellTest); |
| 104 }; | 106 }; |
| 105 | 107 |
| 106 } // namespace test | 108 } // namespace test |
| 107 } // namespace mojo | 109 } // namespace mojo |
| 108 | 110 |
| 109 #endif // MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ | 111 #endif // MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ |
| OLD | NEW |