| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <map> | 5 #include <map> |
| 6 #include <memory> | 6 #include <memory> |
| 7 | 7 |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_impl_base.h" | 9 #include "mojo/public/cpp/application/application_impl_base.h" |
| 10 #include "mojo/public/cpp/application/run_application.h" | 10 #include "mojo/public/cpp/application/run_application.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 private: | 114 private: |
| 115 MOJO_DISALLOW_COPY_AND_ASSIGN(HumanResourceSystemServer); | 115 MOJO_DISALLOW_COPY_AND_ASSIGN(HumanResourceSystemServer); |
| 116 }; | 116 }; |
| 117 | 117 |
| 118 } // namespace versioning | 118 } // namespace versioning |
| 119 } // namespace test | 119 } // namespace test |
| 120 } // namespace mojo | 120 } // namespace mojo |
| 121 | 121 |
| 122 MojoResult MojoMain(MojoHandle application_request) { | 122 MojoResult MojoMain(MojoHandle application_request) { |
| 123 mojo::test::versioning::HumanResourceSystemServer hr_system_server; | 123 mojo::test::versioning::HumanResourceSystemServer hr_system_server; |
| 124 return mojo::RunApplication(application_request, &hr_system_server); | 124 return mojo::RunMainApplication(application_request, &hr_system_server); |
| 125 } | 125 } |
| OLD | NEW |