RELAND: ImageCapture: move image_capture.mojom from media/mojo/interfaces/ to media/capture/mojo/

Original CL was reverted due to breaking webkit_tests in
chromium.webkit/builders/WebKit%20Mac10.9/builds/40056

This is due to a problem that already bit me :-)
build infra script to zip up mojom files wasn't updated,
ongoing in https://chromium-review.googlesource.com/c/414565/

Original CL description ------------------------------
ImageCapture: move image_capture.mojom to media/capture/mojo/

This CL moves image_capture.mojom from media/mojo/interfaces/ to
media/capture/mojo/ where it belongs logically speaking, and
updates BUILD.gns and include paths.

image_capture.mojom was in media/mojo/interfaces because
when it landed, media/capture/mojo was not existing.

BUG=518807
TEST=No code touched, if compile passes, it works
(but there's also content_browsertests).

TBR=xhwang@chromium.org for the removal in media/mojo/interfaces/BUILD.gn

Review-Url: https://codereview.chromium.org/2539543002
Cr-Commit-Position: refs/heads/master@{#434873}
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index f805948..f89003f6 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -89,11 +89,11 @@
     "//ipc:mojom",
     "//media",
     "//media/capture",
+    "//media/capture/mojo:image_capture",
     "//media/gpu/ipc/client",
     "//media/midi",
     "//media/midi:mojo_cpp_sources",
     "//media/mojo/interfaces",
-    "//media/mojo/interfaces:image_capture",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 0d798d5..27079e1 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -75,7 +75,6 @@
   "+third_party/WebKit/public/platform/mime_registry.mojom.h",
   "+third_party/WebKit/public/platform/modules/background_sync/background_sync.mojom.h",
   "+third_party/WebKit/public/platform/modules/broadcastchannel/broadcast_channel.mojom.h",
-  "+third_party/WebKit/public/platform/modules/imagecapture/image_capture.mojom.h",
   "+third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h",
   "+third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h",
   "+third_party/WebKit/public/platform/modules/notifications/WebNotificationConstants.h",
diff --git a/content/browser/media/capture/image_capture_impl.h b/content/browser/media/capture/image_capture_impl.h
index bb919cf3..a4b3cf4 100644
--- a/content/browser/media/capture/image_capture_impl.h
+++ b/content/browser/media/capture/image_capture_impl.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_IMAGE_CAPTURE_IMPL_H_
 #define CONTENT_BROWSER_MEDIA_CAPTURE_IMAGE_CAPTURE_IMPL_H_
 
-#include "media/mojo/interfaces/image_capture.mojom.h"
+#include "media/capture/mojo/image_capture.mojom.h"
 
 namespace content {
 
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 4676e9d..a1c29f0 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -238,7 +238,7 @@
     "//ipc:test_support",
     "//media",
     "//media/capture",
-    "//media/mojo/interfaces:image_capture",
+    "//media/capture/mojo:image_capture",
     "//mojo/edk/system",
     "//mojo/edk/test:test_support",
     "//net:test_support",
diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
index be3e518..d5481f0 100644
--- a/media/capture/BUILD.gn
+++ b/media/capture/BUILD.gn
@@ -95,7 +95,7 @@
     "//base",
     "//base:i18n",
     "//media",
-    "//media/mojo/interfaces:image_capture",
+    "//media/capture/mojo:image_capture",
     "//skia",
     "//third_party/libyuv",
     "//ui/display",
@@ -178,7 +178,7 @@
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//media/base:test_support",
-    "//media/mojo/interfaces:image_capture",
+    "//media/capture/mojo:image_capture",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",
diff --git a/media/capture/content/android/BUILD.gn b/media/capture/content/android/BUILD.gn
index 3030b397..2dea9fc 100644
--- a/media/capture/content/android/BUILD.gn
+++ b/media/capture/content/android/BUILD.gn
@@ -23,7 +23,7 @@
   ]
   deps = [
     ":screen_capture_jni_headers",
-    "//media/mojo/interfaces:image_capture",
+    "//media/capture/mojo:image_capture",
     "//third_party/libyuv",
   ]
 }
diff --git a/media/capture/mojo/BUILD.gn b/media/capture/mojo/BUILD.gn
index c1b2258c..fc19ee1 100644
--- a/media/capture/mojo/BUILD.gn
+++ b/media/capture/mojo/BUILD.gn
@@ -15,3 +15,9 @@
     "//ui/gfx/geometry/mojo",
   ]
 }
+
+mojom("image_capture") {
+  sources = [
+    "image_capture.mojom",
+  ]
+}
diff --git a/media/mojo/interfaces/image_capture.mojom b/media/capture/mojo/image_capture.mojom
similarity index 100%
rename from media/mojo/interfaces/image_capture.mojom
rename to media/capture/mojo/image_capture.mojom
diff --git a/media/capture/video/android/BUILD.gn b/media/capture/video/android/BUILD.gn
index 53ca20d..5f3ba73 100644
--- a/media/capture/video/android/BUILD.gn
+++ b/media/capture/video/android/BUILD.gn
@@ -27,7 +27,7 @@
   ]
   deps = [
     ":capture_jni_headers",
-    "//media/mojo/interfaces:image_capture",
+    "//media/capture/mojo:image_capture",
     "//third_party/libyuv",
   ]
 }
diff --git a/media/capture/video/blob_utils.h b/media/capture/video/blob_utils.h
index edf53472..2f71535 100644
--- a/media/capture/video/blob_utils.h
+++ b/media/capture/video/blob_utils.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_CAPTURE_VIDEO_BLOB_UTILS_H_
 #define MEDIA_CAPTURE_VIDEO_BLOB_UTILS_H_
 
-#include "media/mojo/interfaces/image_capture.mojom.h"
+#include "media/capture/mojo/image_capture.mojom.h"
 
 namespace media {
 
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
index 000b0feb..211f4d4 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -28,10 +28,10 @@
 #include "build/build_config.h"
 #include "media/base/video_frame.h"
 #include "media/capture/capture_export.h"
+#include "media/capture/mojo/image_capture.mojom.h"
 #include "media/capture/video/scoped_result_callback.h"
 #include "media/capture/video/video_capture_device_descriptor.h"
 #include "media/capture/video_capture_types.h"
-#include "media/mojo/interfaces/image_capture.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn
index 4a003f61..4480ae6 100644
--- a/media/mojo/interfaces/BUILD.gn
+++ b/media/mojo/interfaces/BUILD.gn
@@ -33,12 +33,6 @@
   ]
 }
 
-mojom("image_capture") {
-  sources = [
-    "image_capture.mojom",
-  ]
-}
-
 mojom("remoting") {
   sources = [
     "remoting.mojom",
diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn
index 66cad4f..522df4e 100644
--- a/services/video_capture/BUILD.gn
+++ b/services/video_capture/BUILD.gn
@@ -48,8 +48,8 @@
     "//base",
     "//media",
     "//media/capture:capture",
+    "//media/capture/mojo:image_capture",
     "//media/mojo/common:common",
-    "//media/mojo/interfaces:image_capture",
     "//mojo/common:common_base",
     "//services/service_manager/public/cpp",
     "//services/video_capture/public/interfaces",
diff --git a/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js b/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
index ee1225d..e712c32 100644
--- a/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
+++ b/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
@@ -2,7 +2,7 @@
 
 let mockImageCaptureReady = define(
   'mockImageCapture',
-  ['media/mojo/interfaces/image_capture.mojom',
+  ['media/capture/mojo/image_capture.mojom',
    'mojo/public/js/bindings',
    'mojo/public/js/connection',
    'content/public/renderer/interfaces',
diff --git a/third_party/WebKit/Source/modules/imagecapture/BUILD.gn b/third_party/WebKit/Source/modules/imagecapture/BUILD.gn
index dfed63f..9262549 100644
--- a/third_party/WebKit/Source/modules/imagecapture/BUILD.gn
+++ b/third_party/WebKit/Source/modules/imagecapture/BUILD.gn
@@ -14,6 +14,6 @@
   ]
 
   deps = [
-    "//media/mojo/interfaces:image_capture_blink",
+    "//media/capture/mojo:image_capture_blink",
   ]
 }
diff --git a/third_party/WebKit/Source/modules/imagecapture/DEPS b/third_party/WebKit/Source/modules/imagecapture/DEPS
index 055e227..f874cfc 100644
--- a/third_party/WebKit/Source/modules/imagecapture/DEPS
+++ b/third_party/WebKit/Source/modules/imagecapture/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+media/mojo/interfaces/image_capture.mojom-blink.h",
+  "+media/capture/mojo/image_capture.mojom-blink.h",
 ]
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
index 6ef3fa7..c3d68c2 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -9,7 +9,7 @@
 #include "bindings/core/v8/ScriptPromise.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/events/EventTarget.h"
-#include "media/mojo/interfaces/image_capture.mojom-blink.h"
+#include "media/capture/mojo/image_capture.mojom-blink.h"
 #include "modules/EventTargetModules.h"
 #include "modules/ModulesExport.h"
 #include "platform/AsyncMethodRunner.h"
diff --git a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
index 9f9d739..45a9ac1 100644
--- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
+++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
@@ -6,7 +6,7 @@
 #define PhotoCapabilities_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
-#include "media/mojo/interfaces/image_capture.mojom-blink.h"
+#include "media/capture/mojo/image_capture.mojom-blink.h"
 #include "modules/imagecapture/MediaSettingsRange.h"
 #include "wtf/text/WTFString.h"