Move services/data_decoder/public/{interfaces => mojom}

krockot · Commit Bot · commit 19db638f87e6 · 2018-02-10T01:41:02.000Z
TBR=dcheng@chromium.org TBR=jam@chromium.org Bug: 806965 Change-Id: I7b4053e39cc589c96e9b64c991c0226fb1550563 Reviewed-on: https://chromium-review.googlesource.com/911945 Reviewed-by: Ken Rockot <rockot@chromium.org> Commit-Queue: Ken Rockot <rockot@chromium.org> Cr-Commit-Position: refs/heads/master@{#535918}
diff --git a/chrome/browser/safe_json_parser_browsertest.cc b/chrome/browser/safe_json_parser_browsertest.cc
@@ -15,8 +15,8 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "services/data_decoder/public/cpp/safe_json_parser.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
-#include "services/data_decoder/public/interfaces/json_parser.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
+#include "services/data_decoder/public/mojom/json_parser.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/service_manager.mojom.h"
 
diff --git a/chrome/browser/safe_xml_parser_browsertest.cc b/chrome/browser/safe_xml_parser_browsertest.cc
@@ -14,8 +14,8 @@
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/test/test_utils.h"
 #include "services/data_decoder/public/cpp/safe_xml_parser.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
-#include "services/data_decoder/public/interfaces/xml_parser.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
+#include "services/data_decoder/public/mojom/xml_parser.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -121,7 +121,7 @@ jumbo_source_set("browser") {
     "//services/catalog/public/cpp",
     "//services/catalog/public/interfaces:constants",
     "//services/data_decoder/public/cpp",
-    "//services/data_decoder/public/interfaces",
+    "//services/data_decoder/public/mojom",
     "//services/device:lib",
     "//services/device/public/cpp:device_features",
     "//services/device/public/interfaces",
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
@@ -50,7 +50,7 @@
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/public/cpp/manifest_parsing_util.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
 #include "services/device/device_service.h"
 #include "services/device/public/interfaces/constants.mojom.h"
 #include "services/metrics/metrics_mojo_service.h"
diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
@@ -20,7 +20,7 @@
 #include "content/utility/utility_thread_impl.h"
 #include "media/media_features.h"
 #include "services/data_decoder/data_decoder_service.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
 #include "services/network/network_service.h"
 #include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
diff --git a/extensions/browser/image_sanitizer.h b/extensions/browser/image_sanitizer.h
@@ -15,7 +15,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
-#include "services/data_decoder/public/interfaces/image_decoder.mojom.h"
+#include "services/data_decoder/public/mojom/image_decoder.mojom.h"
 #include "services/service_manager/public/cpp/identity.h"
 
 class SkBitmap;
diff --git a/extensions/browser/json_file_sanitizer.h b/extensions/browser/json_file_sanitizer.h
@@ -15,7 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/values.h"
-#include "services/data_decoder/public/interfaces/json_parser.mojom.h"
+#include "services/data_decoder/public/mojom/json_parser.mojom.h"
 #include "services/service_manager/public/cpp/identity.h"
 
 namespace service_manager {
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
@@ -44,7 +44,7 @@
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/switches.h"
 #include "extensions/strings/grit/extensions_strings.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/extensions/browser/sandboxed_unpacker.h b/extensions/browser/sandboxed_unpacker.h
@@ -22,7 +22,7 @@
 #include "extensions/browser/install/crx_install_error.h"
 #include "extensions/browser/json_file_sanitizer.h"
 #include "extensions/common/manifest.h"
-#include "services/data_decoder/public/interfaces/json_parser.mojom.h"
+#include "services/data_decoder/public/mojom/json_parser.mojom.h"
 #include "services/service_manager/public/cpp/identity.h"
 
 class SkBitmap;
diff --git a/ipc/README.md b/ipc/README.md
@@ -157,7 +157,7 @@ service. Your first order of business is to translate this into a suitable
 public interface definition within that service:
 
 ``` cpp
-// src/services/data_decoder/public/interfaces/png_decoder.mojom
+// src/services/data_decoder/public/mojom/png_decoder.mojom
 module data_decoder.mojom;
 
 interface PngDecoder {
diff --git a/services/data_decoder/BUILD.gn b/services/data_decoder/BUILD.gn
@@ -29,7 +29,7 @@ source_set("lib") {
   ]
 
   public_deps = [
-    "//services/data_decoder/public/interfaces",
+    "//services/data_decoder/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 }
diff --git a/services/data_decoder/data_decoder_service.cc b/services/data_decoder/data_decoder_service.cc
@@ -11,7 +11,7 @@
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/data_decoder/image_decoder_impl.h"
 #include "services/data_decoder/json_parser_impl.h"
-#include "services/data_decoder/public/interfaces/image_decoder.mojom.h"
+#include "services/data_decoder/public/mojom/image_decoder.mojom.h"
 #include "services/data_decoder/xml_parser.h"
 #include "services/service_manager/public/cpp/service_context.h"
 
diff --git a/services/data_decoder/image_decoder_impl.h b/services/data_decoder/image_decoder_impl.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "services/data_decoder/public/interfaces/image_decoder.mojom.h"
+#include "services/data_decoder/public/mojom/image_decoder.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 #include "ui/gfx/geometry/size.h"
 
diff --git a/services/data_decoder/json_parser_impl.h b/services/data_decoder/json_parser_impl.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "services/data_decoder/public/interfaces/json_parser.mojom.h"
+#include "services/data_decoder/public/mojom/json_parser.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {
diff --git a/services/data_decoder/public/cpp/BUILD.gn b/services/data_decoder/public/cpp/BUILD.gn
@@ -20,7 +20,7 @@ source_set("cpp") {
   ]
 
   public_deps = [
-    "//services/data_decoder/public/interfaces",
+    "//services/data_decoder/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 
diff --git a/services/data_decoder/public/cpp/decode_image.cc b/services/data_decoder/public/cpp/decode_image.cc
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "base/bind_helpers.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/services/data_decoder/public/cpp/decode_image.h b/services/data_decoder/public/cpp/decode_image.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "services/data_decoder/public/interfaces/image_decoder.mojom.h"
+#include "services/data_decoder/public/mojom/image_decoder.mojom.h"
 
 namespace gfx {
 class Size;
diff --git a/services/data_decoder/public/cpp/safe_json_parser_impl.cc b/services/data_decoder/public/cpp/safe_json_parser_impl.cc
@@ -10,7 +10,7 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/unguessable_token.h"
 #include "base/values.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/constants.mojom.h"
 
diff --git a/services/data_decoder/public/cpp/safe_json_parser_impl.h b/services/data_decoder/public/cpp/safe_json_parser_impl.h
@@ -13,7 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "services/data_decoder/public/cpp/safe_json_parser.h"
-#include "services/data_decoder/public/interfaces/json_parser.mojom.h"
+#include "services/data_decoder/public/mojom/json_parser.mojom.h"
 
 namespace base {
 class Value;
diff --git a/services/data_decoder/public/cpp/safe_xml_parser.cc b/services/data_decoder/public/cpp/safe_xml_parser.cc
@@ -9,8 +9,8 @@
 #include "base/threading/thread_checker.h"
 #include "base/unguessable_token.h"
 #include "base/values.h"
-#include "services/data_decoder/public/interfaces/constants.mojom.h"
-#include "services/data_decoder/public/interfaces/xml_parser.mojom.h"
+#include "services/data_decoder/public/mojom/constants.mojom.h"
+#include "services/data_decoder/public/mojom/xml_parser.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/constants.mojom.h"
 
diff --git a/services/data_decoder/public/mojom/BUILD.gn b/services/data_decoder/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "image_decoder.mojom",
     "json_parser.mojom",
diff --git a/services/data_decoder/public/mojom/OWNERS b/services/data_decoder/public/mojom/OWNERS
diff --git a/services/data_decoder/public/mojom/constants.mojom b/services/data_decoder/public/mojom/constants.mojom
diff --git a/services/data_decoder/public/mojom/image_decoder.mojom b/services/data_decoder/public/mojom/image_decoder.mojom
diff --git a/services/data_decoder/public/mojom/json_parser.mojom b/services/data_decoder/public/mojom/json_parser.mojom
diff --git a/services/data_decoder/public/mojom/xml_parser.mojom b/services/data_decoder/public/mojom/xml_parser.mojom
diff --git a/services/data_decoder/xml_parser.h b/services/data_decoder/xml_parser.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "services/data_decoder/public/interfaces/xml_parser.mojom.h"
+#include "services/data_decoder/public/mojom/xml_parser.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace data_decoder {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ source_set("lib") {`
`29`	`29`	`]`
`30`	`30`
`31`	`31`	`public_deps = [`
`32`		`- "//services/data_decoder/public/interfaces",`
	`32`	`+ "//services/data_decoder/public/mojom",`
`33`	`33`	`"//services/service_manager/public/cpp",`
`34`	`34`	`]`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ source_set("cpp") {`
`20`	`20`	`]`
`21`	`21`
`22`	`22`	`public_deps = [`
`23`		`- "//services/data_decoder/public/interfaces",`
	`23`	`+ "//services/data_decoder/public/mojom",`
`24`	`24`	`"//services/service_manager/public/cpp",`
`25`	`25`	`]`
`26`	`26`