Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1015)

Unified Diff: content/browser/service_worker/embedded_worker_test_helper.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/embedded_worker_test_helper.cc
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
index 3be53735aa46a8df5007fb2de5f2c93ed5a5a53e..cd4ab57504fe40b45785092b2a1714623e2effae 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -61,8 +61,8 @@ class EmbeddedWorkerTestHelper::MockEmbeddedWorkerSetup
void ExchangeInterfaceProviders(
int32_t thread_id,
- mojo::shell::mojom::InterfaceProviderRequest services,
- mojo::shell::mojom::InterfaceProviderPtr exposed_services) override {
+ shell::mojom::InterfaceProviderRequest services,
+ shell::mojom::InterfaceProviderPtr exposed_services) override {
if (!helper_)
return;
helper_->OnSetupMojoStub(thread_id, std::move(services),
@@ -102,7 +102,7 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(
new ServiceRegistryImpl);
render_process_service_registry_.ServiceRegistry::AddService(
base::Bind(&MockEmbeddedWorkerSetup::Create, weak_factory_.GetWeakPtr()));
- mojo::shell::mojom::InterfaceProviderPtr services;
+ shell::mojom::InterfaceProviderPtr services;
render_process_service_registry_.Bind(mojo::GetProxy(&services));
host_service_registry->BindRemoteServiceProvider(std::move(services));
render_process_host_->SetServiceRegistry(std::move(host_service_registry));
@@ -421,8 +421,8 @@ void EmbeddedWorkerTestHelper::OnPushEventStub(
void EmbeddedWorkerTestHelper::OnSetupMojoStub(
int thread_id,
- mojo::shell::mojom::InterfaceProviderRequest services,
- mojo::shell::mojom::InterfaceProviderPtr exposed_services) {
+ shell::mojom::InterfaceProviderRequest services,
+ shell::mojom::InterfaceProviderPtr exposed_services) {
std::unique_ptr<ServiceRegistryImpl> new_registry(new ServiceRegistryImpl);
new_registry->Bind(std::move(services));
new_registry->BindRemoteServiceProvider(std::move(exposed_services));
« no previous file with comments | « content/browser/service_worker/embedded_worker_test_helper.h ('k') | content/child/mojo/mojo_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698