[Mojo Video Capture] Use string keys instead of VideoCaptureDeviceDescriptor

services/video_capture/device_factory_media_to_mojo_adapter.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_VIDEO_CAPTURE_DEVICE_FACTORY_MEDIA_TO_MOJO_ADAPTER_H_
 #define SERVICES_VIDEO_CAPTURE_DEVICE_FACTORY_MEDIA_TO_MOJO_ADAPTER_H_
 
 #include <map>
 
 #include "media/capture/video/video_capture_device_client.h"
@@ skipping 16 matching lines @@
   DeviceFactoryMediaToMojoAdapter(
       std::unique_ptr<media::VideoCaptureDeviceFactory> device_factory,
       const media::VideoCaptureJpegDecoderFactoryCB&
           jpeg_decoder_factory_callback);
   ~DeviceFactoryMediaToMojoAdapter() override;
 
   // mojom::VideoCaptureDeviceFactory:
   void EnumerateDeviceDescriptors(
       const EnumerateDeviceDescriptorsCallback& callback) override;
   void GetSupportedFormats(
-      const media::VideoCaptureDeviceDescriptor& device_descriptor,
+      const std::string& device_id,
       const GetSupportedFormatsCallback& callback) override;
-  void CreateDeviceProxy(
-      const media::VideoCaptureDeviceDescriptor& device_descriptor,
-      mojom::VideoCaptureDeviceProxyRequest proxy_request,
-      const CreateDeviceProxyCallback& callback) override;
+  void CreateDeviceProxy(const std::string& device_id,
+                         mojom::VideoCaptureDeviceProxyRequest proxy_request,
+                         const CreateDeviceProxyCallback& callback) override;
 
  private:
   struct ActiveDeviceEntry {
     ActiveDeviceEntry();
     ~ActiveDeviceEntry();
     ActiveDeviceEntry(ActiveDeviceEntry&& other);
     ActiveDeviceEntry& operator=(ActiveDeviceEntry&& other);
 
     std::unique_ptr<VideoCaptureDeviceProxyImpl> device_proxy;
     // TODO(chfremer) Use mojo::Binding<> directly instead of unique_ptr<> when
     // mojo::Binding<> supports move operators.
     // https://crbug.com/644314
     std::unique_ptr<mojo::Binding<mojom::VideoCaptureDeviceProxy>> binding;
   };
 
-  void OnClientConnectionErrorOrClose(
-      const media::VideoCaptureDeviceDescriptor& descriptor);
+  void OnClientConnectionErrorOrClose(const std::string& device_id);
+
+  // Returns false if no descriptor found.
+  bool LookupDescriptorFromId(const std::string& device_id,
+                              media::VideoCaptureDeviceDescriptor* descriptor);
 
   const std::unique_ptr<media::VideoCaptureDeviceFactory> device_factory_;
   const media::VideoCaptureJpegDecoderFactoryCB jpeg_decoder_factory_callback_;
-  std::map<media::VideoCaptureDeviceDescriptor, ActiveDeviceEntry>
-      active_devices_;
+  std::map<std::string, ActiveDeviceEntry> active_devices_by_id_;
 };
 
 }  // namespace video_capture
 
 #endif  // SERVICES_VIDEO_CAPTURE_DEVICE_FACTORY_MEDIA_TO_MOJO_ADAPTER_H_