services/shape_detection/public/{interfaces => mojom}

TBR=dcheng@chromium.org TBR=jam@chromium.org Bug: 806965 Cq-Include-Trybots: master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win10_chromium_x64_rel_ng Change-Id: I301857ed92c18e80943ac4b6abab062c839b332f Reviewed-on: https://chromium-review.googlesource.com/911998 Commit-Queue: Ken Rockot <rockot@chromium.org> Reviewed-by: Ken Rockot <rockot@chromium.org> Cr-Commit-Position: refs/heads/master@{#536002}
marcosholgado · Feb 11, 2018 · d7e999b · d7e999b
1 parent 374d3a7
commit d7e999b
Show file tree

Hide file tree

Showing 52 changed files with 75 additions and 75 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -909,7 +909,7 @@ if (!is_ios) {
       "//mojo/public/interfaces/bindings/tests:test_data_deps",
       "//services/device/public/interfaces:interfaces_js_data_deps",
       "//services/device/public/interfaces:generic_sensor_js_data_deps",
-      "//services/shape_detection/public/interfaces:interfaces_js_data_deps",
+      "//services/shape_detection/public/mojom:mojom_js_data_deps",
       "//third_party/WebKit/public:blink_devtools_frontend_resources_files",
       "//third_party/WebKit/public:mojo_bindings_js_data_deps",
       "//third_party/mesa:osmesa",

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -242,7 +242,7 @@ android_library("chrome_java") {
     "//services/service_manager/public/java:service_manager_java",
     "//services/service_manager/public/mojom:mojom_java",
     "//services/shape_detection:shape_detection_java",
-    "//services/shape_detection/public/interfaces:interfaces_java",
+    "//services/shape_detection/public/mojom:mojom_java",
     "//skia/public/interfaces:interfaces_java",
     "//third_party/WebKit/public:android_mojo_bindings_java",
     "//third_party/WebKit/public:blink_headers_java",

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1802,7 +1802,7 @@ split_static_library("browser") {
     "//services/proxy_resolver/public/mojom",
     "//services/resource_coordinator/public/cpp:resource_coordinator_cpp",
     "//services/service_manager/public/cpp",
-    "//services/shape_detection/public/interfaces",
+    "//services/shape_detection/public/mojom",
     "//skia",
     "//sql",
     "//storage/browser",

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
@@ -69,7 +69,7 @@ include_rules = [
   "+services/resource_coordinator/public/cpp",
   "+services/resource_coordinator/public/mojom",
   "+services/service_manager",
-  "+services/shape_detection/public/interfaces",
+  "+services/shape_detection/public/mojom",
   "+services/ui/common",
   "+services/ui/public",
   "+services/ui/service.h",

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -143,7 +143,7 @@ jumbo_source_set("browser") {
     "//services/service_manager/runner/common",
     "//services/service_manager/runner/host:lib",
     "//services/shape_detection:lib",
-    "//services/shape_detection/public/interfaces",
+    "//services/shape_detection/public/mojom",
     "//services/ui/public/cpp/gpu",
     "//services/video_capture:lib",
     "//services/video_capture/public/cpp",

diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
@@ -28,10 +28,10 @@
 #include "services/network/restricted_cookie_manager.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"
-#include "services/shape_detection/public/interfaces/constants.mojom.h"
-#include "services/shape_detection/public/interfaces/facedetection_provider.mojom.h"
-#include "services/shape_detection/public/interfaces/textdetection.mojom.h"
+#include "services/shape_detection/public/mojom/barcodedetection.mojom.h"
+#include "services/shape_detection/public/mojom/constants.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
+#include "services/shape_detection/public/mojom/textdetection.mojom.h"
 #include "third_party/WebKit/public/platform/modules/notifications/notification_service.mojom.h"
 #include "url/origin.h"
 

diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
@@ -70,7 +70,7 @@
 #include "services/service_manager/runner/host/service_process_launcher.h"
 #include "services/service_manager/sandbox/sandbox_type.h"
 #include "services/service_manager/service_manager.h"
-#include "services/shape_detection/public/interfaces/constants.mojom.h"
+#include "services/shape_detection/public/mojom/constants.mojom.h"
 #include "services/video_capture/public/interfaces/constants.mojom.h"
 #include "services/video_capture/service_impl.h"
 #include "services/viz/public/interfaces/constants.mojom.h"

diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
@@ -79,7 +79,7 @@ target(link_target_type, "gpu_sources") {
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
     "//services/shape_detection:lib",
-    "//services/shape_detection/public/interfaces",
+    "//services/shape_detection/public/mojom",
     "//services/viz/privileged/interfaces",
     "//skia",
     "//third_party/angle:angle_gpu_info_util",

diff --git a/content/gpu/gpu_service_factory.cc b/content/gpu/gpu_service_factory.cc
@@ -8,7 +8,7 @@
 
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "services/shape_detection/public/interfaces/constants.mojom.h"
+#include "services/shape_detection/public/mojom/constants.mojom.h"
 #include "services/shape_detection/shape_detection_service.h"
 
 #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)

diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
@@ -55,7 +55,7 @@ android_library("content_java") {
     "//services/service_manager/public/java:service_manager_java",
     "//services/service_manager/public/mojom:mojom_java",
     "//services/shape_detection:shape_detection_java",
-    "//services/shape_detection/public/interfaces:interfaces_java",
+    "//services/shape_detection/public/mojom:mojom_java",
     "//third_party/WebKit/common:mojo_bindings_java",
     "//third_party/WebKit/public:android_mojo_bindings_java",
     "//third_party/WebKit/public:blink_headers_java",

diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
@@ -46,7 +46,7 @@ jumbo_source_set("utility") {
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
     "//services/shape_detection:lib",
-    "//services/shape_detection/public/interfaces",
+    "//services/shape_detection/public/mojom",
     "//services/video_capture:lib",
     "//services/video_capture/public/interfaces:constants",
     "//services/viz:lib",

diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
@@ -24,7 +24,7 @@
 #include "services/network/network_service.h"
 #include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
-#include "services/shape_detection/public/interfaces/constants.mojom.h"
+#include "services/shape_detection/public/mojom/constants.mojom.h"
 #include "services/shape_detection/shape_detection_service.h"
 #include "services/video_capture/public/interfaces/constants.mojom.h"
 #include "services/video_capture/service_impl.h"

diff --git a/services/BUILD.gn b/services/BUILD.gn
@@ -171,7 +171,7 @@ if (is_android) {
       "//base:base_java_test_support",
       "//mojo/public/java:bindings_java",
       "//services/shape_detection:shape_detection_java",
-      "//services/shape_detection/public/interfaces:interfaces_java",
+      "//services/shape_detection/public/mojom:mojom_java",
       "//skia/public/interfaces:interfaces_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",

diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
@@ -59,7 +59,7 @@ source_set("lib") {
     "//base",
     "//media/capture",
     "//services/service_manager/public/cpp",
-    "//services/shape_detection/public/interfaces",
+    "//services/shape_detection/public/mojom",
   ]
 
   if (is_android) {
@@ -97,7 +97,7 @@ if (is_android) {
       "//mojo/public/java:system_java",
       "//services/service_manager/public/java:service_manager_java",
       "//services/service_manager/public/mojom:mojom_java",
-      "//services/shape_detection/public/interfaces:interfaces_java",
+      "//services/shape_detection/public/mojom:mojom_java",
       "//skia/public/interfaces:interfaces_java",
       "//ui/gfx/geometry/mojo:mojo_java",
     ]

diff --git a/...ices/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java b/...ices/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java
@@ -21,7 +21,7 @@
 
 /**
  * Android implementation of the FaceDetection service defined in
- * services/shape_detection/public/interfaces/facedetection.mojom
+ * services/shape_detection/public/mojom/facedetection.mojom
  */
 public class FaceDetectionImpl implements FaceDetection {
     private static final String TAG = "FaceDetectionImpl";

diff --git a/...ape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java b/...ape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java
@@ -26,7 +26,7 @@
 
 /**
  * Google Play services implementation of the FaceDetection service defined in
- * services/shape_detection/public/interfaces/facedetection.mojom
+ * services/shape_detection/public/mojom/facedetection.mojom
  */
 public class FaceDetectionImplGmsCore implements FaceDetection {
     private static final String TAG = "FaceDetectionImpl";

diff --git a/services/shape_detection/barcode_detection_impl.h b/services/shape_detection/barcode_detection_impl.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_SHAPE_DETECTION_BARCODE_DETECTION_IMPL_H_
 #define SERVICES_SHAPE_DETECTION_BARCODE_DETECTION_IMPL_H_
 
-#include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"
+#include "services/shape_detection/public/mojom/barcodedetection.mojom.h"
 
 namespace shape_detection {
 

diff --git a/services/shape_detection/barcode_detection_impl_mac.h b/services/shape_detection/barcode_detection_impl_mac.h
@@ -7,7 +7,7 @@
 
 #include "base/mac/availability.h"
 #include "base/mac/scoped_nsobject.h"
-#include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"
+#include "services/shape_detection/public/mojom/barcodedetection.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 @class CIDetector;

diff --git a/services/shape_detection/detection_utils_mac.h b/services/shape_detection/detection_utils_mac.h
@@ -8,7 +8,7 @@
 #import <QuartzCore/QuartzCore.h>
 
 #include "base/mac/scoped_nsobject.h"
-#include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"
+#include "services/shape_detection/public/mojom/barcodedetection.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace shape_detection {

diff --git a/services/shape_detection/face_detection_impl_mac.h b/services/shape_detection/face_detection_impl_mac.h
@@ -6,7 +6,7 @@
 #define SERVICES_SHAPE_DETECTION_FACE_DETECTION_IMPL_MAC_H_
 
 #include "base/mac/scoped_nsobject.h"
-#include "services/shape_detection/public/interfaces/facedetection.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 @class CIDetector;

diff --git a/services/shape_detection/face_detection_impl_win.h b/services/shape_detection/face_detection_impl_win.h
@@ -16,7 +16,7 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shape_detection/detection_utils_win.h"
-#include "services/shape_detection/public/interfaces/facedetection.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection.mojom.h"
 
 class SkBitmap;
 

diff --git a/services/shape_detection/face_detection_impl_win_unittest.cc b/services/shape_detection/face_detection_impl_win_unittest.cc
@@ -17,7 +17,7 @@
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/windows_version.h"
 #include "services/shape_detection/face_detection_provider_win.h"
-#include "services/shape_detection/public/interfaces/facedetection_provider.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 

diff --git a/services/shape_detection/face_detection_provider_impl.h b/services/shape_detection/face_detection_provider_impl.h
@@ -6,7 +6,7 @@
 #define SERVICES_SHAPE_DETECTION_FACE_DETECTION_PROVIDER_IMPL_H_
 
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shape_detection/public/interfaces/facedetection_provider.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 
 namespace shape_detection {
 

diff --git a/services/shape_detection/face_detection_provider_mac.h b/services/shape_detection/face_detection_provider_mac.h
@@ -6,7 +6,7 @@
 #define SERVICES_SHAPE_DETECTION_FACE_DETECTION_PROVIDER_MAC_H_
 
 #include "base/macros.h"
-#include "services/shape_detection/public/interfaces/facedetection_provider.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 
 namespace shape_detection {
 

diff --git a/services/shape_detection/face_detection_provider_win.h b/services/shape_detection/face_detection_provider_win.h
@@ -14,7 +14,7 @@
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shape_detection/detection_utils_win.h"
 #include "services/shape_detection/face_detection_impl_win.h"
-#include "services/shape_detection/public/interfaces/facedetection_provider.mojom.h"
+#include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 
 namespace shape_detection {
 

diff --git a/...hape_detection/public/interfaces/BUILD.gn → ...ces/shape_detection/public/mojom/BUILD.gn b/...hape_detection/public/interfaces/BUILD.gn → ...ces/shape_detection/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "barcodedetection.mojom",
     "constants.mojom",

diff --git a/.../shape_detection/public/interfaces/OWNERS → services/shape_detection/public/mojom/OWNERS b/.../shape_detection/public/interfaces/OWNERS → services/shape_detection/public/mojom/OWNERS
diff --git a/.../public/interfaces/barcodedetection.mojom → ...ction/public/mojom/barcodedetection.mojom b/.../public/interfaces/barcodedetection.mojom → ...ction/public/mojom/barcodedetection.mojom
diff --git a/...tection/public/interfaces/constants.mojom → ...pe_detection/public/mojom/constants.mojom b/...tection/public/interfaces/constants.mojom → ...pe_detection/public/mojom/constants.mojom
diff --git a/...ion/public/interfaces/facedetection.mojom → ...etection/public/mojom/facedetection.mojom b/...ion/public/interfaces/facedetection.mojom → ...etection/public/mojom/facedetection.mojom
diff --git a/...c/interfaces/facedetection_provider.mojom → ...public/mojom/facedetection_provider.mojom b/...c/interfaces/facedetection_provider.mojom → ...public/mojom/facedetection_provider.mojom
diff --git a/...ion/public/interfaces/textdetection.mojom → ...etection/public/mojom/textdetection.mojom b/...ion/public/interfaces/textdetection.mojom → ...etection/public/mojom/textdetection.mojom
diff --git a/services/shape_detection/text_detection_impl.h b/services/shape_detection/text_detection_impl.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_SHAPE_DETECTION_TEXT_DETECTION_IMPL_H_
 #define SERVICES_SHAPE_DETECTION_TEXT_DETECTION_IMPL_H_
 
-#include "services/shape_detection/public/interfaces/textdetection.mojom.h"
+#include "services/shape_detection/public/mojom/textdetection.mojom.h"
 
 namespace shape_detection {
 

diff --git a/services/shape_detection/text_detection_impl_mac.h b/services/shape_detection/text_detection_impl_mac.h
@@ -7,7 +7,7 @@
 
 #include "base/mac/availability.h"
 #include "base/mac/scoped_nsobject.h"
-#include "services/shape_detection/public/interfaces/textdetection.mojom.h"
+#include "services/shape_detection/public/mojom/textdetection.mojom.h"
 
 @class CIDetector;
 

diff --git a/services/shape_detection/text_detection_impl_win.h b/services/shape_detection/text_detection_impl_win.h
@@ -15,7 +15,7 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shape_detection/detection_utils_win.h"
-#include "services/shape_detection/public/interfaces/textdetection.mojom.h"
+#include "services/shape_detection/public/mojom/textdetection.mojom.h"
 
 class SkBitmap;
 

diff --git a/services/shape_detection/text_detection_impl_win_unittest.cc b/services/shape_detection/text_detection_impl_win_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/windows_version.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shape_detection/public/interfaces/textdetection.mojom.h"
+#include "services/shape_detection/public/mojom/textdetection.mojom.h"
 #include "services/shape_detection/text_detection_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/png_codec.h"

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLCanvasElement.html b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLCanvasElement.html
@@ -2,10 +2,10 @@
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/barcodedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection_provider.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/textdetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/barcodedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js"></script>
 <script src="resources/mock-barcodedetection.js"></script>
 <script src="resources/mock-facedetection.js"></script>
 <script src="resources/mock-textdetection.js"></script>

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html
@@ -2,10 +2,10 @@
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/barcodedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection_provider.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/textdetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/barcodedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js"></script>
 <script src="resources/mock-barcodedetection.js"></script>
 <script src="resources/mock-facedetection.js"></script>
 <script src="resources/mock-textdetection.js"></script>

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLVideoElement.html b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLVideoElement.html
@@ -2,10 +2,10 @@
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/barcodedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection_provider.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/textdetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/barcodedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js"></script>
 <script src="resources/mock-barcodedetection.js"></script>
 <script src="resources/mock-facedetection.js"></script>
 <script src="resources/mock-textdetection.js"></script>

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-ImageBitmap.html b/third_party/WebKit/LayoutTests/shapedetection/detection-ImageBitmap.html
@@ -2,10 +2,10 @@
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/barcodedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection_provider.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/textdetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/barcodedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js"></script>
 <script src="resources/mock-barcodedetection.js"></script>
 <script src="resources/mock-facedetection.js"></script>
 <script src="resources/mock-textdetection.js"></script>

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-ImageData.html b/third_party/WebKit/LayoutTests/shapedetection/detection-ImageData.html
@@ -2,10 +2,10 @@
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/barcodedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection_provider.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/textdetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/barcodedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js"></script>
 <script src="resources/mock-barcodedetection.js"></script>
 <script src="resources/mock-facedetection.js"></script>
 <script src="resources/mock-textdetection.js"></script>

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-options.html b/third_party/WebKit/LayoutTests/shapedetection/detection-options.html
@@ -2,8 +2,8 @@
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection.mojom.js"></script>
-<script src="file:///gen/services/shape_detection/public/interfaces/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
 <script src="resources/mock-facedetection.js"></script>
 <body>
 <img id="img" src="../media/content/greenbox.png"/>