Rename ApplicationDelegate to ShellClient

components/font_service/font_service_app.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/font_service/font_service_app.h"
 
 #include <utility>
 
 #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),
               "Skia and font service flags must match");
 static_assert(static_cast<uint32_t>(SkTypeface::kBold) ==
                   static_cast<uint32_t>(font_service::TypefaceStyle::BOLD),
               "Skia and font service flags must match");
 static_assert(static_cast<uint32_t>(SkTypeface::kItalic) ==
                   static_cast<uint32_t>(font_service::TypefaceStyle::ITALIC),
               "Skia and font service flags must match");
@@ skipping 33 matching lines @@
 
 FontServiceApp::FontServiceApp() {}
 
 FontServiceApp::~FontServiceApp() {}
 
 void FontServiceApp::Initialize(mojo::Shell* shell, const std::string& url,
                                 uint32_t id) {
   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));
 }
 
 void FontServiceApp::MatchFamilyName(const mojo::String& family_name,
                                      TypefaceStyle requested_style,
                                      const MatchFamilyNameCallback& callback) {
   SkFontConfigInterface::FontIdentity result_identity;
   SkString result_family;
   SkTypeface::Style result_style;
@@ skipping 35 matching lines @@
   int count = paths_.count();
   for (int i = 0; i < count; ++i) {
     if (path == *paths_[i])
       return i;
   }
   *paths_.append() = new SkString(path);
   return count;
 }
 
 }  // namespace font_service