| 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 "base/at_exit.h" |   5 #include "base/at_exit.h" | 
|   6 #include "base/command_line.h" |   6 #include "base/command_line.h" | 
|   7 #include "base/macros.h" |   7 #include "base/macros.h" | 
|   8 #include "services/shell/public/cpp/connection.h" |   8 #include "services/service_manager/public/cpp/connection.h" | 
|   9 #include "services/shell/public/cpp/connector.h" |   9 #include "services/service_manager/public/cpp/connector.h" | 
|  10 #include "services/shell/public/cpp/service.h" |  10 #include "services/service_manager/public/cpp/service.h" | 
|  11 #include "services/shell/runner/child/test_native_main.h" |  11 #include "services/service_manager/runner/child/test_native_main.h" | 
|  12 #include "services/shell/runner/init.h" |  12 #include "services/service_manager/runner/init.h" | 
|  13 #include "services/shell/tests/lifecycle/app_client.h" |  13 #include "services/service_manager/tests/lifecycle/app_client.h" | 
|  14  |  14  | 
|  15 int main(int argc, char** argv) { |  15 int main(int argc, char** argv) { | 
|  16   base::AtExitManager at_exit; |  16   base::AtExitManager at_exit; | 
|  17   base::CommandLine::Init(argc, argv); |  17   base::CommandLine::Init(argc, argv); | 
|  18  |  18  | 
|  19   shell::InitializeLogging(); |  19   shell::InitializeLogging(); | 
|  20  |  20  | 
|  21   shell::test::AppClient client; |  21   shell::test::AppClient client; | 
|  22   return shell::TestNativeMain(&client); |  22   return shell::TestNativeMain(&client); | 
|  23 } |  23 } | 
| OLD | NEW |