Create //components/services, move //components/font_service into it

This CL creates //components/services as the canonical location of
Mojo services within //components. It adds documentation and an OWNERS
file.

This CL also moves //components/font_service to
//components/services/font as the first step to getting all existing
services in //components into the canonical location.

The existing code there has a bunch of presubmit warnings. This CL does
not attempt to fix them.

This CL will be followed by changes to restore naming consistency:
- A change that moves the FontService Mojo interface to FontLoader,
  which is a more appropriate name
- A change that renames the font_service service to font and adjusts
  namespaces accordingly

NOPRESUBMIT=true
TBR=dcheng@chromium.org

Change-Id: I0cd668726d9841e6ef47a703c0042a7ec7d17833
Reviewed-on: https://chromium-review.googlesource.com/948855Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542141}

chrome/app/BUILD.gn

@@ -444,7 +444,7 @@ service_manifest("chrome_content_packaged_services_manifest_overlay") {
       "//ash/components/quick_launch:manifest",
       "//ash/components/touch_hud:manifest",
       "//ash:manifest",
-      "//components/font_service:manifest",
+      "//components/services/font:manifest",
     ]
   }
 }

chrome/browser/BUILD.gn

@@ -2855,8 +2855,8 @@ jumbo_split_static_library("browser") {
       "//ash/components/quick_launch/public/mojom:constants",
       "//ash/public/cpp",
       "//chrome/browser/chromeos",
-      "//components/font_service:lib",
-      "//components/font_service/public/interfaces",
+      "//components/services/font:lib",
+      "//components/services/font/public/interfaces",
       "//services/ui/public/cpp/input_devices",
       "//services/ui/public/cpp/input_devices:input_device_controller",
       "//services/ui/public/interfaces",

chrome/browser/mash_service_registry.cc

@@ -8,7 +8,7 @@
 #include "ash/public/interfaces/constants.mojom.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "components/font_service/public/interfaces/constants.mojom.h"
+#include "components/services/font/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 
 using content::ContentBrowserClient;

chrome/utility/BUILD.gn

@@ -154,8 +154,8 @@ static_library("utility") {
       "//ash/components/quick_launch/public/mojom",
       "//ash/components/touch_hud:lib",
       "//chrome/services/file_util:lib",
-      "//components/font_service:lib",
-      "//components/font_service/public/interfaces",
+      "//components/services/font:lib",
+      "//components/services/font/public/interfaces",
       "//services/ui:lib",
       "//services/ui/public/interfaces",
     ]

chrome/utility/DEPS

@@ -18,7 +18,7 @@ include_rules = [
   "+chrome/services/wifi_util_win/wifi_util_win_service.h",
   "+chrome/services/wifi_util_win/public/mojom",
   "+components/crash/core/common/crash_keys.h",
-  "+components/font_service/font_service_app.h",
+  "+components/services/font/font_service_app.h",
   "+components/patch_service",
   "+components/payments/content/utility",
   "+components/printing/service/public/cpp",
@@ -51,8 +51,8 @@ specific_include_rules = {
     "+ash/components/touch_hud/touch_hud_application.h",
     "+ash/public/interfaces",
     "+ash/window_manager_service.h",
-    "+components/font_service/font_service_app.h",
-    "+components/font_service/public/interfaces",
+    "+components/services/font/font_service_app.h",
+    "+components/services/font/public/interfaces",
     "+services/ui/common/image_cursors_set.h",
     "+services/ui/public",
     "+services/ui/service.h",

chrome/utility/mash_service_factory.cc

@@ -14,8 +14,8 @@
 #include "ash/window_manager_service.h"
 #include "base/bind.h"
 #include "build/build_config.h"
-#include "components/font_service/font_service_app.h"
-#include "components/font_service/public/interfaces/constants.mojom.h"
+#include "components/services/font/font_service_app.h"
+#include "components/services/font/public/interfaces/constants.mojom.h"
 #include "services/ui/common/image_cursors_set.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/service.h"

components/services/OWNERS

+file://services/OWNERS

components/services/README.md

+This directory holds [services](/services) that are:
+(a) Not considered part of Chrome's foundation (i.e., //services), but
+(b) Still used by multiple embedders
+
+If in doubt about where your service belongs, contact services-dev@chromium.org.

components/font_service/BUILD.gn → components/services/font/BUILD.gn

@@ -13,7 +13,7 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//components/font_service/public/interfaces",
+    "//components/services/font/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",

components/font_service/font_service_app.cc → components/services/font/font_service_app.cc

@@ -2,7 +2,7 @@
 // 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 "components/services/font/font_service_app.h"
 
 #include <utility>
 
@@ -65,8 +65,7 @@ void FontServiceApp::MatchFamilyName(const std::string& family_name,
       SkFontConfigInterface::GetSingletonDirectInterface();
   const bool r = fc->matchFamilyName(
       family_name.data(),
-      SkFontStyle(requested_style->weight,
-                  requested_style->width,
+      SkFontStyle(requested_style->weight, requested_style->width,
                   static_cast<SkFontStyle::Slant>(requested_style->slant)),
       &result_identity, &result_family, &result_style);
 

components/font_service/font_service_app.h → components/services/font/font_service_app.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_
-#define COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_
+#ifndef COMPONENTS_SERVICES_FONT_FONT_SERVICE_APP_H_
+#define COMPONENTS_SERVICES_FONT_FONT_SERVICE_APP_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/macros.h"
-#include "components/font_service/public/interfaces/font_service.mojom.h"
+#include "components/services/font/public/interfaces/font_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
@@ -52,4 +52,4 @@ class FontServiceApp : public service_manager::Service,
 
 }  // namespace font_service
 
-#endif  // COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_
+#endif  // COMPONENTS_SERVICES_FONT_FONT_SERVICE_APP_H_

components/font_service/main.cc → components/services/font/main.cc

@@ -2,8 +2,8 @@
 // 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 "services/service_manager/public/c/main.h"
+#include "components/services/font/font_service_app.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {

components/font_service/public/cpp/font_loader.cc → components/services/font/public/cpp/font_loader.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/font_service/public/cpp/font_loader.h"
+#include "components/services/font/public/cpp/font_loader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
-#include "components/font_service/public/cpp/font_service_thread.h"
+#include "components/services/font/public/cpp/font_service_thread.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace font_service {
@@ -38,9 +38,8 @@ bool FontLoader::matchFamilyName(const char family_name[],
 }
 
 SkStreamAsset* FontLoader::openStream(const FontIdentity& identity) {
-  TRACE_EVENT2("font_loader", "FontLoader::openStream",
-               "identity", identity.fID,
-               "name", identity.fString.c_str());
+  TRACE_EVENT2("font_loader", "FontLoader::openStream", "identity",
+               identity.fID, "name", identity.fString.c_str());
   {
     base::AutoLock lock(lock_);
     auto mapped_font_files_it = mapped_font_files_.find(identity.fID);
@@ -59,8 +58,9 @@ SkStreamAsset* FontLoader::openStream(const FontIdentity& identity) {
   {
     base::AutoLock lock(lock_);
     auto mapped_font_files_it =
-        mapped_font_files_.insert(std::make_pair(mapped_font_file->font_id(),
-                                                 mapped_font_file.get()))
+        mapped_font_files_
+            .insert(std::make_pair(mapped_font_file->font_id(),
+                                   mapped_font_file.get()))
             .first;
     return mapped_font_files_it->second->CreateMemoryStream();
   }

components/font_service/public/cpp/font_loader.h → components/services/font/public/cpp/font_loader.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_LOADER_H_
-#define COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_LOADER_H_
+#ifndef COMPONENTS_SERVICES_FONT_PUBLIC_CPP_FONT_LOADER_H_
+#define COMPONENTS_SERVICES_FONT_PUBLIC_CPP_FONT_LOADER_H_
 
 #include <stdint.h>
 
@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "components/font_service/public/cpp/mapped_font_file.h"
-#include "components/font_service/public/interfaces/font_service.mojom.h"
+#include "components/services/font/public/cpp/mapped_font_file.h"
+#include "components/services/font/public/interfaces/font_service.mojom.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
@@ -70,4 +70,4 @@ class FontLoader : public SkFontConfigInterface,
 
 }  // namespace font_service
 
-#endif  // COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_LOADER_H_
+#endif  // COMPONENTS_SERVICES_FONT_PUBLIC_CPP_FONT_LOADER_H_

components/font_service/public/cpp/font_service_thread.cc → components/services/font/public/cpp/font_service_thread.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/font_service/public/cpp/font_service_thread.h"
+#include "components/services/font/public/cpp/font_service_thread.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/synchronization/waitable_event.h"
-#include "components/font_service/public/cpp/mapped_font_file.h"
+#include "components/services/font/public/cpp/mapped_font_file.h"
 
 namespace font_service {
 namespace internal {
@@ -132,8 +132,7 @@ void FontServiceThread::OnMatchFamilyNameComplete(
     // behaviour of the current Linux IPC version.
 
     *out_family_name = family_name.data();
-    *out_style = SkFontStyle(style->weight,
-                             style->width,
+    *out_style = SkFontStyle(style->weight, style->width,
                              static_cast<SkFontStyle::Slant>(style->slant));
   }
 

components/font_service/public/cpp/font_service_thread.h → components/services/font/public/cpp/font_service_thread.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_SERVICE_THREAD_H_
-#define COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_SERVICE_THREAD_H_
+#ifndef COMPONENTS_SERVICES_FONT_PUBLIC_CPP_FONT_SERVICE_THREAD_H_
+#define COMPONENTS_SERVICES_FONT_PUBLIC_CPP_FONT_SERVICE_THREAD_H_
 
 #include <stdint.h>
 
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
-#include "components/font_service/public/interfaces/font_service.mojom.h"
+#include "components/services/font/public/interfaces/font_service.mojom.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
@@ -114,4 +114,4 @@ class FontServiceThread : public base::Thread,
 }  // namespace internal
 }  // namespace font_service
 
-#endif  // COMPONENTS_FONT_SERVICE_PUBLIC_CPP_FONT_SERVICE_THREAD_H_
+#endif  // COMPONENTS_SERVICES_FONT_PUBLIC_CPP_FONT_SERVICE_THREAD_H_

components/font_service/public/cpp/mapped_font_file.cc → components/services/font/public/cpp/mapped_font_file.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/font_service/public/cpp/mapped_font_file.h"
+#include "components/services/font/public/cpp/mapped_font_file.h"
 
 #include <utility>
 
@@ -28,7 +28,7 @@ SkMemoryStream* MappedFontFile::CreateMemoryStream() {
   DCHECK(mapped_font_file_.IsValid());
   sk_sp<SkData> data =
       SkData::MakeWithProc(mapped_font_file_.data(), mapped_font_file_.length(),
-                          &MappedFontFile::ReleaseProc, this);
+                           &MappedFontFile::ReleaseProc, this);
   if (!data)
     return nullptr;
   AddRef();

components/font_service/public/cpp/mapped_font_file.h → components/services/font/public/cpp/mapped_font_file.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_FONT_SERVICE_PUBLIC_CPP_MAPPED_FONT_FILE_H_
-#define COMPONENTS_FONT_SERVICE_PUBLIC_CPP_MAPPED_FONT_FILE_H_
+#ifndef COMPONENTS_SERVICES_FONT_PUBLIC_CPP_MAPPED_FONT_FILE_H_
+#define COMPONENTS_SERVICES_FONT_PUBLIC_CPP_MAPPED_FONT_FILE_H_
 
 #include <stdint.h>
 
@@ -53,4 +53,4 @@ class MappedFontFile : public base::RefCountedThreadSafe<MappedFontFile> {
 }  // namespace internal
 }  // namespace font_service
 
-#endif  // COMPONENTS_FONT_SERVICE_PUBLIC_CPP_MAPPED_FONT_FILE_H_
+#endif  // COMPONENTS_SERVICES_FONT_PUBLIC_CPP_MAPPED_FONT_FILE_H_

mash/BUILD.gn

@@ -64,7 +64,7 @@ catalog("catalog") {
   }
 
   if (is_linux && !is_android) {
-    standalone_services += [ "//components/font_service:manifest" ]
+    standalone_services += [ "//components/services/font:manifest" ]
   }
 
   if (enable_nacl) {

ui/views/mus/BUILD.gn

@@ -80,9 +80,9 @@ jumbo_component("mus") {
   ]
 
   if (is_linux && !is_android) {
-    deps += [ "//components/font_service/public/cpp" ]
+    deps += [ "//components/services/font/public/cpp" ]
     data_deps = [
-      "//components/font_service",
+      "//components/services/font:font_service",
     ]
   }
 }

ui/views/mus/DEPS

 include_rules = [
   "+cc",
   "-cc/blink",
-  "+components/font_service/public",
+  "+components/services/font/public",
   "+components/gpu",
   "+mojo/cc",
   "+mojo/common",

ui/views/mus/aura_init.cc

@@ -25,7 +25,7 @@
 #include "ui/views/views_delegate.h"
 
 #if defined(OS_LINUX)
-#include "components/font_service/public/cpp/font_loader.h"
+#include "components/services/font/public/cpp/font_loader.h"
 #include "ui/gfx/platform_font_linux.h"
 #endif