Revert "VCD: Move Ash-Chrome only codes under ash/ folder"

This reverts commit 3e19bbb.

Reason for revert: We decide not to put CrOS VCD into Lacros Chrome.

Original change's description:
> VCD: Move Ash-Chrome only codes under ash/ folder
>
> This CL does:
>
> 1. Move CameraHalDispatcherImpl under ash/.
> 2. Move PowerManagerClientProxy into a standalone class under ash/.
>
> Bug: b/175168296
> Test: Build successfully
> Change-Id: I60455aa8e593a5654c69af06957c509a26ac8964
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2589414
> Reviewed-by: Shik Chen <shik@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Wei Lee <wtlee@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#851072}

Bug: b/175168296
Change-Id: I00fef9b0c9e596bc82e550229e2d3ba712c6f6e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2719781
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Shik Chen <shik@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Auto-Submit: Wei Lee <wtlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#859086}

chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h

@@ -16,7 +16,7 @@
 #include "base/observer_list_types.h"
 #include "base/scoped_observation.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include "ui/message_center/public/cpp/notification.h"
 #include "ui/message_center/public/cpp/notification_delegate.h"
 

chrome/browser/chromeos/dbus/vm/vm_permission_service_provider.cc

@@ -21,7 +21,7 @@
 #include "chromeos/dbus/vm_permission_service/vm_permission_service.pb.h"
 #include "components/prefs/pref_service.h"
 #include "dbus/message.h"
-#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {

chrome/browser/ui/ash/media_client_impl.h

@@ -14,7 +14,7 @@
 #include "chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/ui/browser_list_observer.h"
-#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include "media/capture/video/chromeos/mojom/cros_camera_service.mojom.h"
 #include "ui/base/accelerators/media_keys_listener.h"
 

components/arc/camera/DEPS

@@ -1,4 +1,4 @@
 include_rules = [
   "+crypto/random.h",
-  "+media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h",
+  "+media/capture/video/chromeos/camera_hal_dispatcher_impl.h",
 ]

components/arc/camera/arc_camera_bridge.cc

@@ -15,7 +15,7 @@
 #include "components/arc/arc_browser_context_keyed_service_factory_base.h"
 #include "components/arc/session/arc_bridge_service.h"
 #include "crypto/random.h"
-#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/platform/platform_channel.h"
 #include "mojo/public/cpp/system/invitation.h"

content/browser/renderer_host/media/media_stream_manager.cc

@@ -84,7 +84,7 @@
 #include "ash/components/audio/cras_audio_handler.h"
 #include "content/browser/gpu/chromeos/video_capture_dependencies.h"
 #include "content/browser/gpu/gpu_memory_buffer_manager_singleton.h"
-#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include "media/capture/video/chromeos/public/cros_features.h"
 #include "media/capture/video/chromeos/video_capture_device_factory_chromeos.h"
 #endif

media/capture/BUILD.gn

@@ -293,6 +293,8 @@ component("capture_lib") {
       "video/chromeos/camera_device_delegate.h",
       "video/chromeos/camera_hal_delegate.cc",
       "video/chromeos/camera_hal_delegate.h",
+      "video/chromeos/camera_hal_dispatcher_impl.cc",
+      "video/chromeos/camera_hal_dispatcher_impl.h",
       "video/chromeos/camera_metadata_utils.cc",
       "video/chromeos/camera_metadata_utils.h",
       "video/chromeos/capture_metadata_dispatcher.h",
@@ -334,6 +336,7 @@ component("capture_lib") {
     deps += [
       "//ash/constants",
       "//build/config/linux/libdrm",
+      "//chromeos/dbus/power",
       "//components/chromeos_camera:mojo_mjpeg_decode_accelerator",
       "//components/chromeos_camera/common",
       "//components/device_event_log",
@@ -343,17 +346,6 @@ component("capture_lib") {
     ]
   }
 
-  if (is_chromeos_ash) {
-    sources += [
-      "video/chromeos/ash/camera_hal_dispatcher_impl.cc",
-      "video/chromeos/ash/camera_hal_dispatcher_impl.h",
-      "video/chromeos/ash/power_manager_client_proxy.cc",
-      "video/chromeos/ash/power_manager_client_proxy.h",
-    ]
-
-    deps += [ "//chromeos/dbus/power" ]
-  }
-
   if (is_fuchsia) {
     sources += [
       "video/fuchsia/video_capture_device_factory_fuchsia.cc",
@@ -550,10 +542,10 @@ test("capture_unittests") {
 
   if (is_chromeos_ash) {
     sources += [
-      "video/chromeos/ash/camera_hal_dispatcher_impl_unittest.cc",
       "video/chromeos/camera_3a_controller_unittest.cc",
       "video/chromeos/camera_device_delegate_unittest.cc",
       "video/chromeos/camera_hal_delegate_unittest.cc",
+      "video/chromeos/camera_hal_dispatcher_impl_unittest.cc",
       "video/chromeos/request_manager_unittest.cc",
       "video/chromeos/token_manager_unittest.cc",
     ]

media/capture/video/chromeos/DEPS

@@ -1,5 +1,6 @@
 include_rules = [
   "+ash/constants/ash_features.h",
+  "+chromeos/dbus",
   "+components/chromeos_camera",
   "+third_party/libsync",
 ]

media/capture/video/chromeos/camera_hal_delegate.cc

@@ -23,9 +23,9 @@
 #include "base/system/system_monitor.h"
 #include "base/unguessable_token.h"
 #include "components/device_event_log/device_event_log.h"
-#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
 #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h"
 #include "media/capture/video/chromeos/camera_buffer_factory.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include "media/capture/video/chromeos/camera_metadata_utils.h"
 #include "media/capture/video/chromeos/video_capture_device_chromeos_delegate.h"
 #include "media/capture/video/chromeos/video_capture_device_chromeos_halv3.h"

media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.cc → media/capture/video/chromeos/camera_hal_dispatcher_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 "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 #include <fcntl.h>
 #include <grp.h>
 #include <poll.h>

media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h → media/capture/video/chromeos/camera_hal_dispatcher_impl.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 MEDIA_CAPTURE_VIDEO_CHROMEOS_ASH_CAMERA_HAL_DISPATCHER_IMPL_H_
-#define MEDIA_CAPTURE_VIDEO_CHROMEOS_ASH_CAMERA_HAL_DISPATCHER_IMPL_H_
+#ifndef MEDIA_CAPTURE_VIDEO_CHROMEOS_CAMERA_HAL_DISPATCHER_IMPL_H_
+#define MEDIA_CAPTURE_VIDEO_CHROMEOS_CAMERA_HAL_DISPATCHER_IMPL_H_
 
 #include <memory>
 #include <set>
@@ -280,4 +280,4 @@ class CAPTURE_EXPORT CameraHalDispatcherImpl final
 
 }  // namespace media
 
-#endif  // MEDIA_CAPTURE_VIDEO_CHROMEOS_ASH_CAMERA_HAL_DISPATCHER_IMPL_H_
+#endif  // MEDIA_CAPTURE_VIDEO_CHROMEOS_CAMERA_HAL_DISPATCHER_IMPL_H_

media/capture/video/chromeos/ash/camera_hal_dispatcher_impl_unittest.cc → media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.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 "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
+#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
 
 #include <memory>
 #include <utility>