| 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 SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_ | 5 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_ |
| 6 #define SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_ | 6 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "services/shell/public/cpp/connector.h" | 11 #include "services/service_manager/public/cpp/connector.h" |
| 12 #include "services/shell/public/cpp/service.h" | 12 #include "services/service_manager/public/cpp/service.h" |
| 13 #include "services/shell/public/cpp/service_context.h" | 13 #include "services/service_manager/public/cpp/service_context.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 15 |
| 16 namespace base { | 16 namespace base { |
| 17 class MessageLoop; | 17 class MessageLoop; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace shell { | 20 namespace shell { |
| 21 | 21 |
| 22 class BackgroundShell; | 22 class BackgroundShell; |
| 23 | 23 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID; | 99 uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID; |
| 100 | 100 |
| 101 base::Closure initialize_called_; | 101 base::Closure initialize_called_; |
| 102 | 102 |
| 103 DISALLOW_COPY_AND_ASSIGN(ServiceTest); | 103 DISALLOW_COPY_AND_ASSIGN(ServiceTest); |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 } // namespace test | 106 } // namespace test |
| 107 } // namespace shell | 107 } // namespace shell |
| 108 | 108 |
| 109 #endif // SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_ | 109 #endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_ |
| OLD | NEW |