| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/shell/shell_test_base.h" | 5 #include "mojo/shell/shell_test_base.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | |
| 9 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "net/base/filename_util.h" | 13 #include "net/base/filename_util.h" |
| 14 #include "net/test/embedded_test_server/embedded_test_server.h" | 14 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 15 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace shell { | 18 namespace shell { |
| 19 namespace test { | 19 namespace test { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 shell_context_.mojo_url_resolver()->SetBaseURL( | 55 shell_context_.mojo_url_resolver()->SetBaseURL( |
| 56 test_server_->base_url()); | 56 test_server_->base_url()); |
| 57 | 57 |
| 58 return shell_context_.ConnectToServiceByName( | 58 return shell_context_.ConnectToServiceByName( |
| 59 application_url, service_name).Pass(); | 59 application_url, service_name).Pass(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace test | 62 } // namespace test |
| 63 } // namespace shell | 63 } // namespace shell |
| 64 } // namespace mojo | 64 } // namespace mojo |
| OLD | NEW |