Revert "Connect VmCameraMicManager with camera service for PluginVM"

This reverts commit 31b56eca.

Reason for revert: This is the most likely cause for b/1155159 from the blame list.

Original change's description:
> Connect VmCameraMicManager with camera service for PluginVM
>
> The camera notification/indicator is shown when PluginVM accesses camera
> now. Note that flags pluginvm-show-camera-permissions and
> vm-camera-mic-indicators-and-notifications need to be turned on.
>
> Bug: b/167491603
> Change-Id: Ib2e3f7bc85531313811d2525ecac394aadee6e17
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2557122
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Reviewed-by: Joel Hockey <joelhockey@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#832576}

TBR=xiyuan@chromium.org,joelhockey@chromium.org,lxj@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: b/167491603
Change-Id: I9bbe24795038456a08dc1ea1819de8ed639f2642
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2571642Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Robert Kroeger <rjkroege@chromium.org>
Auto-Submit: Robert Kroeger <rjkroege@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833394}

chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.cc

@@ -12,7 +12,6 @@
 #include "base/feature_list.h"
 #include "base/notreached.h"
 #include "base/strings/string16.h"
-#include "base/system/sys_info.h"
 #include "base/time/time.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chromeos/camera_mic/vm_camera_mic_manager_factory.h"
@@ -26,9 +25,6 @@
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "components/vector_icons/vector_icons.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "media/capture/video/chromeos/mojom/cros_camera_service.mojom-shared.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/message_center/public/cpp/message_center_constants.h"
 #include "ui/message_center/public/cpp/notification.h"
@@ -105,21 +101,11 @@ VmCameraMicManager::VmCameraMicManager(Profile* profile)
       active_map_[std::make_pair(vm, device)] = false;
     }
   }
-
-  // Camera service does not behave in non ChromeOS environment (e.g. testing,
-  // linux chromeos).
-  if (base::SysInfo::IsRunningOnChromeOS()) {
-    // OnActiveClientChange() will be called automatically after the
-    // subscription, so there is no need to get the current status here.
-    camera_observation_.Observe(media::CameraHalDispatcherImpl::GetInstance());
-  }
 }
 
 VmCameraMicManager::~VmCameraMicManager() = default;
 
 void VmCameraMicManager::SetActive(VmType vm, DeviceType device, bool active) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
   auto active_it = active_map_.find(std::make_pair(vm, device));
   CHECK(active_it != active_map_.end());
   if (active_it->second != active) {
@@ -150,20 +136,6 @@ bool VmCameraMicManager::GetDeviceActive(DeviceType device) const {
   return false;
 }
 
-void VmCameraMicManager::OnActiveClientChange(
-    cros::mojom::CameraClientType type,
-    bool is_active) {
-  // TODO(b/167491603): UNKNOWN means PluginVM for now. We should switch to
-  // `PLUGINVM` once the API work on b/173677647 is done.
-  if (type == cros::mojom::CameraClientType::UNKNOWN) {
-    content::GetUIThreadTaskRunner({})->PostTask(
-        FROM_HERE,
-        base::BindOnce(&VmCameraMicManager::SetActive,
-                       weak_ptr_factory_.GetWeakPtr(), VmType::kPluginVm,
-                       DeviceType::kCamera, is_active));
-  }
-}
-
 void VmCameraMicManager::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }

chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h

@@ -11,10 +11,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
-#include "base/scoped_observation.h"
 #include "base/timer/timer.h"
 #include "components/keyed_service/core/keyed_service.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"
 
@@ -27,8 +25,7 @@ namespace chromeos {
 // the primary and non-incognito profile. We might need to change this if we
 // extend this class to support the browser, in which case we will also need to
 // make the notification ids different for different profiles.
-class VmCameraMicManager : public KeyedService,
-                           public media::CameraActiveClientObserver {
+class VmCameraMicManager : public KeyedService {
  public:
   enum class VmType { kCrostiniVm, kPluginVm };
 
@@ -54,17 +51,11 @@ class VmCameraMicManager : public KeyedService,
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  // TODO(b/167491603): Make `SetActive()` private after we implement audio
-  // service observer.
   void SetActive(VmType vm, DeviceType device, bool active);
   bool GetActive(VmType vm, DeviceType device) const;
   // Return true if any of the VMs is using the device.
   bool GetDeviceActive(DeviceType device) const;
 
-  // media::CameraActiveClientObserver
-  void OnActiveClientChange(cros::mojom::CameraClientType type,
-                            bool is_active) override;
-
  private:
   using ActiveMap = base::flat_map<std::pair<VmType, DeviceType>, bool>;
 
@@ -100,15 +91,6 @@ class VmCameraMicManager : public KeyedService,
 
   base::RetainingOneShotTimer observer_timer_;
   base::ObserverList<Observer> observers_;
-
-  base::ScopedObservation<
-      media::CameraHalDispatcherImpl,
-      media::CameraActiveClientObserver,
-      &media::CameraHalDispatcherImpl::AddActiveClientObserver,
-      &media::CameraHalDispatcherImpl::RemoveActiveClientObserver>
-      camera_observation_{this};
-
-  base::WeakPtrFactory<VmCameraMicManager> weak_ptr_factory_{this};
 };
 
 }  // namespace chromeos

chrome/browser/chromeos/login/session/user_session_initializer.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chromeos/arc/session/arc_service_launcher.h"
-#include "chrome/browser/chromeos/camera_mic/vm_camera_mic_manager_factory.h"
 #include "chrome/browser/chromeos/child_accounts/child_status_reporting_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/child_user_service_factory.h"
 #include "chrome/browser/chromeos/child_accounts/family_user_metrics_service_factory.h"
@@ -211,8 +210,6 @@ void UserSessionInitializer::OnUserSessionStarted(bool is_primary_user) {
         plugin_vm::PluginVmManagerFactory::GetForProfile(primary_profile_);
     if (plugin_vm_manager)
       plugin_vm_manager->OnPrimaryUserSessionStarted();
-
-    VmCameraMicManagerFactory::GetForProfile(primary_profile_);
   }
 }