diff options
Diffstat (limited to 'chromium/fuchsia/runners/web')
| -rw-r--r-- | chromium/fuchsia/runners/web/OWNERS | 2 | ||||
| -rw-r--r-- | chromium/fuchsia/runners/web/main.cc | 13 | ||||
| -rw-r--r-- | chromium/fuchsia/runners/web/web_runner_smoke_test.cc | 10 |
3 files changed, 14 insertions, 11 deletions
diff --git a/chromium/fuchsia/runners/web/OWNERS b/chromium/fuchsia/runners/web/OWNERS new file mode 100644 index 00000000000..2f43650c9db --- /dev/null +++ b/chromium/fuchsia/runners/web/OWNERS @@ -0,0 +1,2 @@ +per-file *.cmx=set noparent +per-file *.cmx=file://fuchsia/SECURITY_OWNERS diff --git a/chromium/fuchsia/runners/web/main.cc b/chromium/fuchsia/runners/web/main.cc index 719419d8350..267fe44de47 100644 --- a/chromium/fuchsia/runners/web/main.cc +++ b/chromium/fuchsia/runners/web/main.cc @@ -5,14 +5,15 @@ #include <lib/sys/cpp/component_context.h> #include "base/command_line.h" -#include "base/fuchsia/default_context.h" #include "base/fuchsia/file_utils.h" +#include "base/fuchsia/process_context.h" #include "base/fuchsia/scoped_service_binding.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h" #include "fuchsia/base/fuchsia_dir_scheme.h" #include "fuchsia/base/init_logging.h" +#include "fuchsia/base/inspect.h" #include "fuchsia/runners/buildflags.h" #include "fuchsia/runners/common/web_content_runner.h" @@ -60,12 +61,12 @@ int main(int argc, char** argv) { WebContentRunner runner(std::move(get_context_params_callback)); base::fuchsia::ScopedServiceBinding<fuchsia::sys::Runner> binding( - base::fuchsia::ComponentContextForCurrentProcess()->outgoing().get(), - &runner); + base::ComponentContextForProcess()->outgoing().get(), &runner); - base::fuchsia::ComponentContextForCurrentProcess() - ->outgoing() - ->ServeFromStartupInfo(); + base::ComponentContextForProcess()->outgoing()->ServeFromStartupInfo(); + + // Publish version information for this component to Inspect. + cr_fuchsia::PublishVersionInfoToInspect(base::ComponentInspectorForProcess()); // Run until there are no Components, or the last service client channel is // closed. diff --git a/chromium/fuchsia/runners/web/web_runner_smoke_test.cc b/chromium/fuchsia/runners/web/web_runner_smoke_test.cc index 91ba0d00ddb..bd38e2ca004 100644 --- a/chromium/fuchsia/runners/web/web_runner_smoke_test.cc +++ b/chromium/fuchsia/runners/web/web_runner_smoke_test.cc @@ -8,7 +8,7 @@ #include <lib/sys/cpp/component_context.h> #include "base/bind.h" -#include "base/fuchsia/default_context.h" +#include "base/fuchsia/process_context.h" #include "base/fuchsia/scoped_service_binding.h" #include "base/fuchsia/service_provider_impl.h" #include "base/test/task_environment.h" @@ -107,7 +107,7 @@ TEST_F(WebRunnerSmokeTest, MAYBE_RequestHtmlAndImage) { fuchsia::sys::LaunchInfo launch_info = LaunchInfoWithServices(); launch_info.url = test_server_.GetURL("/test.html").spec(); - auto launcher = base::fuchsia::ComponentContextForCurrentProcess() + auto launcher = base::ComponentContextForProcess() ->svc() ->Connect<fuchsia::sys::Launcher>(); @@ -128,7 +128,7 @@ TEST_F(WebRunnerSmokeTest, LifecycleTerminate) { launch_info.url = test_server_.GetURL("/test.html").spec(); launch_info.directory_request = directory.NewRequest().TakeChannel(); - auto launcher = base::fuchsia::ComponentContextForCurrentProcess() + auto launcher = base::ComponentContextForProcess() ->svc() ->Connect<fuchsia::sys::Launcher>(); @@ -157,7 +157,7 @@ TEST_F(WebRunnerSmokeTest, ComponentExitOnFrameClose) { fuchsia::sys::LaunchInfo launch_info = LaunchInfoWithServices(); launch_info.url = test_server_.GetURL("/window_close.html").spec(); - auto launcher = base::fuchsia::ComponentContextForCurrentProcess() + auto launcher = base::ComponentContextForProcess() ->svc() ->Connect<fuchsia::sys::Launcher>(); @@ -204,7 +204,7 @@ TEST_F(WebRunnerSmokeTest, RemoveSelfFromStoryOnFrameClose) { launch_info.additional_services->names.emplace_back( fuchsia::modular::ModuleContext::Name_); - auto launcher = base::fuchsia::ComponentContextForCurrentProcess() + auto launcher = base::ComponentContextForProcess() ->svc() ->Connect<fuchsia::sys::Launcher>(); |