Move //components/patch_service to //components/services/patch

Moves this service into the canonical location for services within
//components.

A followup CL will rename the service from "patch_service" to "patch".

TBR=dcheng@chromium.org
NOPRESUBMIT=true

Change-Id: I36207005323653f85d7be5841b0ecf60a29fdc85
Reviewed-on: https://chromium-review.googlesource.com/955648Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543133}

chrome/app/BUILD.gn

@@ -387,7 +387,7 @@ static_library("test_support") {
 chrome_packaged_services = [
   ":chrome_manifest",
   "//chrome/profiling:manifest",
-  "//components/patch_service:manifest",
+  "//components/services/patch:manifest",
   "//components/unzip_service:manifest",
   "//chrome/services/file_util:manifest",
   "//services/proxy_resolver:proxy_resolver_manifest",

chrome/browser/BUILD.gn

@@ -1671,7 +1671,6 @@ jumbo_split_static_library("browser") {
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
     "//components/password_manager/sync/browser",
-    "//components/patch_service/public/interfaces",
     "//components/payments/core",
     "//components/physical_web/eddystone",
     "//components/policy:generated",
@@ -1695,6 +1694,7 @@ jumbo_split_static_library("browser") {
     "//components/security_interstitials/core",
     "//components/security_state/content",
     "//components/security_state/core",
+    "//components/services/patch/public/interfaces",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/signin/core/browser:signin_buildflags",

chrome/browser/chrome_content_browser_client.cc

@@ -164,7 +164,6 @@
 #include "components/nacl/common/nacl_constants.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
-#include "components/patch_service/public/interfaces/constants.mojom.h"
 #include "components/payments/content/payment_request_display_manager.h"
 #include "components/policy/content/policy_blacklist_navigation_throttle.h"
 #include "components/pref_registry/pref_registry_syncable.h"
@@ -181,6 +180,7 @@
 #include "components/safe_browsing/db/database_manager.h"
 #include "components/safe_browsing/features.h"
 #include "components/safe_browsing/password_protection/password_protection_navigation_throttle.h"
+#include "components/services/patch/public/interfaces/constants.mojom.h"
 #include "components/signin/core/browser/profile_management_switches.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h"

chrome/browser/component_updater/component_patcher_operation_browsertest.cc

@@ -17,7 +17,7 @@
 #include "base/task_scheduler/task_traits.h"
 #include "build/build_config.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/patch_service/public/cpp/patch.h"
+#include "components/services/patch/public/cpp/patch.h"
 #include "components/update_client/component_patcher_operation.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"

chrome/utility/BUILD.gn

@@ -31,8 +31,8 @@ static_library("utility") {
     "//chrome/common:mojo_bindings",
     "//chrome/common/profiling",
     "//chrome/profiling",
-    "//components/patch_service:lib",
     "//components/search_engines",
+    "//components/services/patch:lib",
     "//components/strings",
     "//components/unzip_service:lib",
     "//components/url_formatter",

chrome/utility/DEPS

@@ -19,7 +19,7 @@ include_rules = [
   "+chrome/services/wifi_util_win/public/mojom",
   "+components/crash/core/common/crash_keys.h",
   "+components/services/font/font_service_app.h",
-  "+components/patch_service",
+  "+components/services/patch",
   "+components/payments/content/utility",
   "+components/printing/service/public/cpp",
   "+components/printing/service/public/interfaces",

chrome/utility/chrome_content_utility_client.cc

@@ -17,8 +17,8 @@
 #include "chrome/common/buildflags.h"
 #include "chrome/common/profiling/constants.mojom.h"
 #include "chrome/profiling/profiling_service.h"
-#include "components/patch_service/patch_service.h"
-#include "components/patch_service/public/interfaces/constants.mojom.h"
+#include "components/services/patch/patch_service.h"
+#include "components/services/patch/public/interfaces/constants.mojom.h"
 #include "components/unzip_service/public/interfaces/constants.mojom.h"
 #include "components/unzip_service/unzip_service.h"
 #include "content/public/common/content_switches.h"

components/patch_service/BUILD.gn → components/services/patch/BUILD.gn

@@ -21,7 +21,7 @@ source_set("lib") {
   ]
 
   public_deps = [
-    "//components/patch_service/public/interfaces",
+    "//components/services/patch/public/interfaces",
     "//services/service_manager/public/cpp",
   ]
 }

components/patch_service/file_patcher_impl.cc → components/services/patch/file_patcher_impl.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/patch_service/file_patcher_impl.h"
+#include "components/services/patch/file_patcher_impl.h"
 
 #include "courgette/courgette.h"
 #include "courgette/third_party/bsdiff/bsdiff.h"

components/patch_service/file_patcher_impl.h → components/services/patch/file_patcher_impl.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_PATCH_SERVICE_FILE_PATCHER_IMPL_H_
-#define COMPONENTS_PATCH_SERVICE_FILE_PATCHER_IMPL_H_
+#ifndef COMPONENTS_SERVICES_PATCH_FILE_PATCHER_IMPL_H_
+#define COMPONENTS_SERVICES_PATCH_FILE_PATCHER_IMPL_H_
 
 #include <memory>
 
 #include "base/files/file.h"
 #include "base/macros.h"
-#include "components/patch_service/public/interfaces/file_patcher.mojom.h"
+#include "components/services/patch/public/interfaces/file_patcher.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace patch {
@@ -38,4 +38,4 @@ class FilePatcherImpl : public mojom::FilePatcher {
 
 }  // namespace patch
 
-#endif  // COMPONENTS_PATCH_SERVICE_FILE_PATCHER_IMPL_H_
+#endif  // COMPONENTS_SERVICES_PATCH_FILE_PATCHER_IMPL_H_

components/patch_service/patch_service.cc → components/services/patch/patch_service.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/patch_service/patch_service.h"
+#include "components/services/patch/patch_service.h"
 
 #include "build/build_config.h"
-#include "components/patch_service/file_patcher_impl.h"
+#include "components/services/patch/file_patcher_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace patch {

components/patch_service/patch_service.h → components/services/patch/patch_service.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_PATCH_SERVICE_PATCH_SERVICE_H_
-#define COMPONENTS_PATCH_SERVICE_PATCH_SERVICE_H_
+#ifndef COMPONENTS_SERVICES_PATCH_PATCH_SERVICE_H_
+#define COMPONENTS_SERVICES_PATCH_PATCH_SERVICE_H_
 
 #include <memory>
 
@@ -37,4 +37,4 @@ class PatchService : public service_manager::Service {
 
 }  // namespace patch
 
-#endif  // COMPONENTS_PATCH_SERVICE_PATCH_SERVICE_H_
+#endif  // COMPONENTS_SERVICES_PATCH_PATCH_SERVICE_H_

components/patch_service/public/cpp/BUILD.gn → components/services/patch/public/cpp/BUILD.gn

@@ -11,7 +11,7 @@ source_set("cpp") {
   ]
 
   public_deps = [
-    "//components/patch_service/public/interfaces",
+    "//components/services/patch/public/interfaces",
     "//services/service_manager/public/cpp",
   ]
 }

components/patch_service/public/cpp/patch.cc → components/services/patch/public/cpp/patch.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/patch_service/public/cpp/patch.h"
+#include "components/services/patch/public/cpp/patch.h"
 
 #include <utility>
 
@@ -15,8 +15,8 @@
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "components/patch_service/public/interfaces/constants.mojom.h"
-#include "components/patch_service/public/interfaces/file_patcher.mojom.h"
+#include "components/services/patch/public/interfaces/constants.mojom.h"
+#include "components/services/patch/public/interfaces/file_patcher.mojom.h"
 #include "components/update_client/component_patcher_operation.h"  // nogncheck
 #include "services/service_manager/public/cpp/connector.h"
 

components/patch_service/public/cpp/patch.h → components/services/patch/public/cpp/patch.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_PATCH_SERVICE_PUBLIC_CPP_PATCH_H_
-#define COMPONENTS_PATCH_SERVICE_PUBLIC_CPP_PATCH_H_
+#ifndef COMPONENTS_SERVICES_PATCH_PUBLIC_CPP_PATCH_H_
+#define COMPONENTS_SERVICES_PATCH_PUBLIC_CPP_PATCH_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ void Patch(service_manager::Connector* connector,
 
 }  // namespace patch
 
-#endif  // COMPONENTS_PATCH_SERVICE_PUBLIC_CPP_PATCH_H_
+#endif  // COMPONENTS_SERVICES_PATCH_PUBLIC_CPP_PATCH_H_

components/update_client/BUILD.gn

@@ -67,8 +67,8 @@ static_library("update_client") {
     "//components/client_update_protocol",
     "//components/crx_file",
     "//components/data_use_measurement/core",
-    "//components/patch_service/public/cpp",
     "//components/prefs",
+    "//components/services/patch/public/cpp",
     "//components/unzip_service/public/cpp",
     "//components/version_info:version_info",
     "//courgette:courgette_lib",
@@ -100,8 +100,8 @@ static_library("test_support") {
 
   deps = [
     "//base",
-    "//components/patch_service:lib",
     "//components/prefs",
+    "//components/services/patch:lib",
     "//components/unzip_service:lib",
     "//mojo/public/cpp/bindings",
     "//net:test_support",
@@ -165,9 +165,9 @@ source_set("unit_tests") {
     ":update_client",
     "//base",
     "//components/crx_file",
-    "//components/patch_service:lib",
     "//components/prefs",
     "//components/prefs:test_support",
+    "//components/services/patch:lib",
     "//components/version_info:version_info",
     "//courgette:courgette_lib",
     "//net:test_support",

components/update_client/DEPS

@@ -2,7 +2,7 @@ include_rules = [
   "+components/client_update_protocol",
   "+components/crx_file",
   "+components/data_use_measurement/core",
-  "+components/patch_service",
+  "+components/services/patch",
   "+components/prefs",
   "+components/unzip_service",
   "+components/version_info",

components/update_client/component_patcher_operation.cc

@@ -15,7 +15,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "components/patch_service/public/cpp/patch.h"
+#include "components/services/patch/public/cpp/patch.h"
 #include "components/update_client/update_client.h"
 #include "components/update_client/update_client_errors.h"
 #include "components/update_client/utils.h"

components/update_client/component_patcher_unittest.cc

@@ -12,7 +12,7 @@
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
-#include "components/patch_service/patch_service.h"
+#include "components/services/patch/patch_service.h"
 #include "components/update_client/component_patcher_operation.h"
 #include "components/update_client/component_patcher_unittest.h"
 #include "components/update_client/test_installer.h"

components/update_client/test_configurator.cc

@@ -8,8 +8,8 @@
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/version.h"
-#include "components/patch_service/patch_service.h"
 #include "components/prefs/pref_service.h"
+#include "components/services/patch/patch_service.h"
 #include "components/unzip_service/unzip_service.h"
 #include "components/update_client/activity_data_service.h"
 #include "net/url_request/url_request_test_util.h"