| 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_helper.h" | 5 #include "shell/shell_test_helper.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.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 "mojo/shell/filename_util.h" | 12 #include "shell/filename_util.h" |
| 13 #include "mojo/shell/init.h" | 13 #include "shell/init.h" |
| 14 #include "mojo/shell/mojo_url_resolver.h" | 14 #include "shell/mojo_url_resolver.h" |
| 15 | 15 |
| 16 namespace mojo { | 16 namespace mojo { |
| 17 namespace shell { | 17 namespace shell { |
| 18 | 18 |
| 19 ShellTestHelper::ShellTestHelper() { | 19 ShellTestHelper::ShellTestHelper() { |
| 20 base::CommandLine::Init(0, NULL); | 20 base::CommandLine::Init(0, NULL); |
| 21 mojo::shell::InitializeLogging(); | 21 mojo::shell::InitializeLogging(); |
| 22 } | 22 } |
| 23 | 23 |
| 24 ShellTestHelper::~ShellTestHelper() { | 24 ShellTestHelper::~ShellTestHelper() { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 38 context_.application_manager()->SetLoaderForURL(loader.Pass(), url); | 38 context_.application_manager()->SetLoaderForURL(loader.Pass(), url); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void ShellTestHelper::AddCustomMapping(const GURL& mojo_url, | 41 void ShellTestHelper::AddCustomMapping(const GURL& mojo_url, |
| 42 const GURL& resolved_url) { | 42 const GURL& resolved_url) { |
| 43 context_.mojo_url_resolver()->AddCustomMapping(mojo_url, resolved_url); | 43 context_.mojo_url_resolver()->AddCustomMapping(mojo_url, resolved_url); |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace shell | 46 } // namespace shell |
| 47 } // namespace mojo | 47 } // namespace mojo |
| OLD | NEW |