2 files changed, 8 insertions, 10 deletions
diff --git a/components/font_service/font_service_app.cc b/components/font_service/font_service_app.cc
index 7618296..8636c7c 100644
--- a/components/font_service/font_service_app.cc
+++ b/components/font_service/font_service_app.cc
@@ -9,7 +9,7 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 
 static_assert(static_cast<uint32_t>(SkTypeface::kNormal) ==
                   static_cast<uint32_t>(font_service::TypefaceStyle::NORMAL),
@@ -63,13 +63,12 @@ void FontServiceApp::Initialize(mojo::Shell* shell, const std::string& url,
   tracing_.Initialize(shell, url);
 }
 
-bool FontServiceApp::AcceptConnection(
-    mojo::ApplicationConnection* connection) {
+bool FontServiceApp::AcceptConnection(mojo::Connection* connection) {
   connection->AddService(this);
   return true;
 }
 
-void FontServiceApp::Create(mojo::ApplicationConnection* connection,
+void FontServiceApp::Create(mojo::Connection* connection,
                             mojo::InterfaceRequest<FontService> request) {
   bindings_.AddBinding(this, std::move(request));
 }
diff --git a/components/font_service/font_service_app.h b/components/font_service/font_service_app.h
index 914eb08..6c2aeea 100644
--- a/components/font_service/font_service_app.h
+++ b/components/font_service/font_service_app.h
@@ -11,13 +11,13 @@
 #include "components/font_service/public/interfaces/font_service.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 #include "skia/ext/skia_utils_base.h"
 
 namespace font_service {
 
-class FontServiceApp : public mojo::ApplicationDelegate,
+class FontServiceApp : public mojo::ShellClient,
                        public mojo::InterfaceFactory<FontService>,
                        public FontService {
  public:
@@ -25,14 +25,13 @@ class FontServiceApp : public mojo::ApplicationDelegate,
   ~FontServiceApp() override;
 
  private:
-  // ApplicationDelegate:
+  // mojo::ShellClient:
   void Initialize(mojo::Shell* shell, const std::string& url,
                   uint32_t id) override;
-  bool AcceptConnection(
-      mojo::ApplicationConnection* connection) override;
+  bool AcceptConnection(mojo::Connection* connection) override;
 
   // mojo::InterfaceFactory<FontService>:
-  void Create(mojo::ApplicationConnection* connection,
+  void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<FontService> request) override;
 
   // FontService: