diff --git a/base/fuchsia/startup_context.cc b/base/fuchsia/startup_context.cc
index 7d1e0c2ac1e22..3655845caeaeb 100644
--- a/base/fuchsia/startup_context.cc
+++ b/base/fuchsia/startup_context.cc
@@ -13,7 +13,6 @@
#include "base/macros.h"
namespace base {
-namespace fuchsia {
StartupContext::StartupContext(::fuchsia::sys::StartupInfo startup_info) {
std::unique_ptr<sys::ServiceDirectory> incoming_services;
@@ -98,5 +97,4 @@ void StartupContext::ServeOutgoingDirectory() {
component_context_->outgoing()->Serve(std::move(outgoing_directory_request_));
}
-} // namespace fuchsia
} // namespace base
diff --git a/base/fuchsia/startup_context.h b/base/fuchsia/startup_context.h
index a2d1f5c42aab7..eeffd4f7f853e 100644
--- a/base/fuchsia/startup_context.h
+++ b/base/fuchsia/startup_context.h
@@ -19,7 +19,6 @@ class OutgoingDirectory;
} // namespace sys
namespace base {
-namespace fuchsia {
// Helper for unpacking a fuchsia.sys.StartupInfo and creating convenience
// wrappers for the various fields (e.g. the incoming & outgoing service
@@ -68,7 +67,6 @@ class BASE_EXPORT StartupContext {
zx::channel outgoing_directory_request_;
};
-} // namespace fuchsia
} // namespace base
#endif // BASE_FUCHSIA_STARTUP_CONTEXT_H_
diff --git a/fuchsia/runners/cast/cast_component.h b/fuchsia/runners/cast/cast_component.h
index 0a127d876229d..e575e04187097 100644
--- a/fuchsia/runners/cast/cast_component.h
+++ b/fuchsia/runners/cast/cast_component.h
@@ -40,7 +40,7 @@ class CastComponent : public WebComponent,
bool AreComplete() const;
// Parameters populated directly from the StartComponent() arguments.
- std::unique_ptr<base::fuchsia::StartupContext> startup_context;
+ std::unique_ptr<base::StartupContext> startup_context;
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request;
diff --git a/fuchsia/runners/cast/cast_runner.cc b/fuchsia/runners/cast/cast_runner.cc
index cd2db638c49d5..b84b3ffc5891b 100644
--- a/fuchsia/runners/cast/cast_runner.cc
+++ b/fuchsia/runners/cast/cast_runner.cc
@@ -182,7 +182,7 @@ class FrameHostComponent : public fuchsia::sys::ComponentController {
// it to connect to the MetricsRecorder.
static base::WeakPtr<const sys::ServiceDirectory>
StartAndReturnIncomingServiceDirectory(
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
+ std::unique_ptr<base::StartupContext> startup_context,
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request,
fuchsia::web::FrameHost* const frame_host_impl) {
@@ -194,11 +194,10 @@ class FrameHostComponent : public fuchsia::sys::ComponentController {
}
private:
- FrameHostComponent(
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
- fidl::InterfaceRequest<fuchsia::sys::ComponentController>
- controller_request,
- fuchsia::web::FrameHost* const frame_host_impl)
+ FrameHostComponent(std::unique_ptr<base::StartupContext> startup_context,
+ fidl::InterfaceRequest<fuchsia::sys::ComponentController>
+ controller_request,
+ fuchsia::web::FrameHost* const frame_host_impl)
: startup_context_(std::move(startup_context)),
frame_host_binding_(startup_context_->outgoing(), frame_host_impl),
weak_incoming_services_(startup_context_->svc()) {
@@ -215,7 +214,7 @@ class FrameHostComponent : public fuchsia::sys::ComponentController {
delete this;
}
- const std::unique_ptr<base::fuchsia::StartupContext> startup_context_;
+ const std::unique_ptr<base::StartupContext> startup_context_;
const base::fuchsia::ScopedServiceBinding<fuchsia::web::FrameHost>
frame_host_binding_;
fidl::Binding<fuchsia::sys::ComponentController> binding_{this};
@@ -229,22 +228,20 @@ class DataResetComponent : public fuchsia::sys::ComponentController,
public chromium::cast::DataReset {
public:
// Creates a DataResetComponent with lifetime managed by |controller_request|.
- static void Start(
- base::OnceCallback<bool()> delete_persistent_data,
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
- fidl::InterfaceRequest<fuchsia::sys::ComponentController>
- controller_request) {
+ static void Start(base::OnceCallback<bool()> delete_persistent_data,
+ std::unique_ptr<base::StartupContext> startup_context,
+ fidl::InterfaceRequest<fuchsia::sys::ComponentController>
+ controller_request) {
new DataResetComponent(std::move(delete_persistent_data),
std::move(startup_context),
std::move(controller_request));
}
private:
- DataResetComponent(
- base::OnceCallback<bool()> delete_persistent_data,
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
- fidl::InterfaceRequest<fuchsia::sys::ComponentController>
- controller_request)
+ DataResetComponent(base::OnceCallback<bool()> delete_persistent_data,
+ std::unique_ptr<base::StartupContext> startup_context,
+ fidl::InterfaceRequest<fuchsia::sys::ComponentController>
+ controller_request)
: delete_persistent_data_(std::move(delete_persistent_data)),
startup_context_(std::move(startup_context)),
data_reset_handler_binding_(startup_context_->outgoing(), this) {
@@ -273,7 +270,7 @@ class DataResetComponent : public fuchsia::sys::ComponentController,
}
base::OnceCallback<bool()> delete_persistent_data_;
- std::unique_ptr<base::fuchsia::StartupContext> startup_context_;
+ std::unique_ptr<base::StartupContext> startup_context_;
const base::fuchsia::ScopedServiceBinding<chromium::cast::DataReset>
data_reset_handler_binding_;
fidl::Binding<fuchsia::sys::ComponentController> binding_{this};
@@ -336,7 +333,7 @@ void CastRunner::StartComponent(
}
auto startup_context =
- std::make_unique<base::fuchsia::StartupContext>(std::move(startup_info));
+ std::make_unique<base::StartupContext>(std::move(startup_info));
if (cors_exempt_headers_) {
StartComponentInternal(cast_url, std::move(startup_context),
@@ -675,7 +672,7 @@ void CastRunner::OnMetricsRecorderServiceRequest(
void CastRunner::StartComponentInternal(
const GURL& url,
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
+ std::unique_ptr<base::StartupContext> startup_context,
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request) {
// TODO(crbug.com/1120914): Remove this once Component Framework v2 can be
diff --git a/fuchsia/runners/cast/cast_runner.h b/fuchsia/runners/cast/cast_runner.h
index 5159d9525d809..e92b9dc9e1e87 100644
--- a/fuchsia/runners/cast/cast_runner.h
+++ b/fuchsia/runners/cast/cast_runner.h
@@ -107,7 +107,7 @@ class CastRunner : public fuchsia::sys::Runner,
// component URL and ensuring that CORS-exempt headers have been fetched.
void StartComponentInternal(
const GURL& url,
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
+ std::unique_ptr<base::StartupContext> startup_context,
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request);
diff --git a/fuchsia/runners/cast/pending_cast_component.cc b/fuchsia/runners/cast/pending_cast_component.cc
index f15ac9e0d96a4..aaf6b80d266d4 100644
--- a/fuchsia/runners/cast/pending_cast_component.cc
+++ b/fuchsia/runners/cast/pending_cast_component.cc
@@ -11,7 +11,7 @@
PendingCastComponent::PendingCastComponent(
Delegate* delegate,
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
+ std::unique_ptr<base::StartupContext> startup_context,
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request,
base::StringPiece app_id)
diff --git a/fuchsia/runners/cast/pending_cast_component.h b/fuchsia/runners/cast/pending_cast_component.h
index 28c0735fbd45e..dca6f7af24c69 100644
--- a/fuchsia/runners/cast/pending_cast_component.h
+++ b/fuchsia/runners/cast/pending_cast_component.h
@@ -39,12 +39,11 @@ class PendingCastComponent {
virtual void CancelPendingComponent(PendingCastComponent* component) = 0;
};
- PendingCastComponent(
- Delegate* delegate,
- std::unique_ptr<base::fuchsia::StartupContext> startup_context,
- fidl::InterfaceRequest<fuchsia::sys::ComponentController>
- controller_request,
- base::StringPiece app_id);
+ PendingCastComponent(Delegate* delegate,
+ std::unique_ptr<base::StartupContext> startup_context,
+ fidl::InterfaceRequest<fuchsia::sys::ComponentController>
+ controller_request,
+ base::StringPiece app_id);
~PendingCastComponent();
PendingCastComponent(const PendingCastComponent&) = delete;
diff --git a/fuchsia/runners/common/web_component.cc b/fuchsia/runners/common/web_component.cc
index 8e5000a413f68..73b7ad6004a4d 100644
--- a/fuchsia/runners/common/web_component.cc
+++ b/fuchsia/runners/common/web_component.cc
@@ -21,7 +21,7 @@
WebComponent::WebComponent(
base::StringPiece debug_name,
WebContentRunner* runner,
- std::unique_ptr<base::fuchsia::StartupContext> context,
+ std::unique_ptr<base::StartupContext> context,
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request)
: debug_name_(debug_name.as_string()),
diff --git a/fuchsia/runners/common/web_component.h b/fuchsia/runners/common/web_component.h
index 9216637fb572d..97cd53b4b3766 100644
--- a/fuchsia/runners/common/web_component.h
+++ b/fuchsia/runners/common/web_component.h
@@ -43,7 +43,7 @@ class WebComponent : public fuchsia::sys::ComponentController,
// lifetime of this component instance.
WebComponent(base::StringPiece debug_name,
WebContentRunner* runner,
- std::unique_ptr<base::fuchsia::StartupContext> context,
+ std::unique_ptr<base::StartupContext> context,
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
controller_request);
@@ -67,7 +67,7 @@ class WebComponent : public fuchsia::sys::ComponentController,
// Returns the component's startup context (e.g. incoming services, public
// service directory, etc).
- base::fuchsia::StartupContext* startup_context() const {
+ base::StartupContext* startup_context() const {
return startup_context_.get();
}
@@ -108,7 +108,7 @@ class WebComponent : public fuchsia::sys::ComponentController,
WebContentRunner* const runner_ = nullptr;
// Component context for this instance, including incoming services.
- const std::unique_ptr<base::fuchsia::StartupContext> startup_context_;
+ const std::unique_ptr<base::StartupContext> startup_context_;
fuchsia::web::FramePtr frame_;
diff --git a/fuchsia/runners/common/web_content_runner.cc b/fuchsia/runners/common/web_content_runner.cc
index da13c8907ca68..9fdd51bbfc067 100644
--- a/fuchsia/runners/common/web_content_runner.cc
+++ b/fuchsia/runners/common/web_content_runner.cc
@@ -78,7 +78,7 @@ void WebContentRunner::StartComponent(
std::unique_ptr<WebComponent> component = std::make_unique<WebComponent>(
std::string(), this,
- std::make_unique<base::fuchsia::StartupContext>(std::move(startup_info)),
+ std::make_unique<base::StartupContext>(std::move(startup_info)),
std::move(controller_request));
#if BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT) != 0
component->EnableRemoteDebugging();