| 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 SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_ |
| 6 #define MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ | 6 #define SERVICES_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 "services/shell/public/cpp/connector.h" |
| 11 #include "mojo/shell/public/cpp/shell_client.h" | 11 #include "services/shell/public/cpp/shell_client.h" |
| 12 #include "mojo/shell/public/cpp/shell_connection.h" | 12 #include "services/shell/public/cpp/shell_connection.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 14 |
| 15 namespace base { | 15 namespace base { |
| 16 class MessageLoop; | 16 class MessageLoop; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace mojo { | 19 namespace mojo { |
| 20 namespace shell { | 20 namespace shell { |
| 21 class BackgroundShell; | 21 class BackgroundShell; |
| 22 } | 22 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_; | 103 base::Closure initialize_called_; |
| 104 | 104 |
| 105 DISALLOW_COPY_AND_ASSIGN(ShellTest); | 105 DISALLOW_COPY_AND_ASSIGN(ShellTest); |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace test | 108 } // namespace test |
| 109 } // namespace mojo | 109 } // namespace mojo |
| 110 | 110 |
| 111 #endif // MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ | 111 #endif // SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_ |
| OLD | NEW |