BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 24 insertions, 25 deletions

diff --git a/chromium/media/capture/video/win/video_capture_device_win.cc b/chromium/media/capture/video/win/video_capture_device_win.cc
index f0c76738a1b..e1e9ac72d22 100644
--- a/chromium/media/capture/video/win/video_capture_device_win.cc
+++ b/chromium/media/capture/video/win/video_capture_device_win.cc
@@ -19,8 +19,8 @@
 #include "media/base/timestamp_constants.h"
 #include "media/capture/video/blob_utils.h"
 
+using Microsoft::WRL::ComPtr;
 using base::win::ScopedCoMem;
-using base::win::ScopedComPtr;
 using base::win::ScopedVariant;
 
 namespace media {
@@ -40,7 +40,7 @@ namespace media {
 bool PinMatchesCategory(IPin* pin, REFGUID category) {
   DCHECK(pin);
   bool found = false;
-  ScopedComPtr<IKsPropertySet> ks_property;
+  ComPtr<IKsPropertySet> ks_property;
   HRESULT hr = pin->QueryInterface(IID_PPV_ARGS(&ks_property));
   if (SUCCEEDED(hr)) {
     GUID pin_category;
@@ -106,7 +106,7 @@ void VideoCaptureDeviceWin::GetDeviceCapabilityList(
     const std::string& device_id,
     bool query_detailed_frame_rates,
     CapabilityList* out_capability_list) {
-  base::win::ScopedComPtr<IBaseFilter> capture_filter;
+  ComPtr<IBaseFilter> capture_filter;
   HRESULT hr = VideoCaptureDeviceWin::GetDeviceFilter(
       device_id, capture_filter.GetAddressOf());
   if (!capture_filter.Get()) {
@@ -115,9 +115,8 @@ void VideoCaptureDeviceWin::GetDeviceCapabilityList(
     return;
   }
 
-  base::win::ScopedComPtr<IPin> output_capture_pin(
-      VideoCaptureDeviceWin::GetPin(capture_filter.Get(), PINDIR_OUTPUT,
-                                    PIN_CATEGORY_CAPTURE, GUID_NULL));
+  ComPtr<IPin> output_capture_pin(VideoCaptureDeviceWin::GetPin(
+      capture_filter.Get(), PINDIR_OUTPUT, PIN_CATEGORY_CAPTURE, GUID_NULL));
   if (!output_capture_pin.Get()) {
     DLOG(ERROR) << "Failed to get capture output pin";
     return;
@@ -129,11 +128,11 @@ void VideoCaptureDeviceWin::GetDeviceCapabilityList(
 
 // static
 void VideoCaptureDeviceWin::GetPinCapabilityList(
-    base::win::ScopedComPtr<IBaseFilter> capture_filter,
-    base::win::ScopedComPtr<IPin> output_capture_pin,
+    ComPtr<IBaseFilter> capture_filter,
+    ComPtr<IPin> output_capture_pin,
     bool query_detailed_frame_rates,
     CapabilityList* out_capability_list) {
-  ScopedComPtr<IAMStreamConfig> stream_config;
+  ComPtr<IAMStreamConfig> stream_config;
   HRESULT hr = output_capture_pin.CopyTo(stream_config.GetAddressOf());
   if (FAILED(hr)) {
     DLOG(ERROR) << "Failed to get IAMStreamConfig interface from "
@@ -143,7 +142,7 @@ void VideoCaptureDeviceWin::GetPinCapabilityList(
   }
 
   // Get interface used for getting the frame rate.
-  ScopedComPtr<IAMVideoControl> video_control;
+  ComPtr<IAMVideoControl> video_control;
   hr = capture_filter.CopyTo(video_control.GetAddressOf());
 
   int count = 0, size = 0;
@@ -224,13 +223,13 @@ HRESULT VideoCaptureDeviceWin::GetDeviceFilter(const std::string& device_id,
                                                IBaseFilter** filter) {
   DCHECK(filter);
 
-  ScopedComPtr<ICreateDevEnum> dev_enum;
+  ComPtr<ICreateDevEnum> dev_enum;
   HRESULT hr = ::CoCreateInstance(CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC,
                                   IID_PPV_ARGS(&dev_enum));
   if (FAILED(hr))
     return hr;
 
-  ScopedComPtr<IEnumMoniker> enum_moniker;
+  ComPtr<IEnumMoniker> enum_moniker;
   hr = dev_enum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory,
                                        enum_moniker.GetAddressOf(), 0);
   // CreateClassEnumerator returns S_FALSE on some Windows OS
@@ -238,11 +237,11 @@ HRESULT VideoCaptureDeviceWin::GetDeviceFilter(const std::string& device_id,
   if (hr != S_OK)
     return hr;
 
-  ScopedComPtr<IBaseFilter> capture_filter;
-  for (ScopedComPtr<IMoniker> moniker;
+  ComPtr<IBaseFilter> capture_filter;
+  for (ComPtr<IMoniker> moniker;
        enum_moniker->Next(1, moniker.GetAddressOf(), NULL) == S_OK;
        moniker.Reset()) {
-    ScopedComPtr<IPropertyBag> prop_bag;
+    ComPtr<IPropertyBag> prop_bag;
     hr = moniker->BindToStorage(0, 0, IID_PPV_ARGS(&prop_bag));
     if (FAILED(hr))
       continue;
@@ -281,12 +280,12 @@ HRESULT VideoCaptureDeviceWin::GetDeviceFilter(const std::string& device_id,
 // Finds an IPin on an IBaseFilter given the direction, Category and/or Major
 // Type. If either |category| or |major_type| are GUID_NULL, they are ignored.
 // static
-ScopedComPtr<IPin> VideoCaptureDeviceWin::GetPin(IBaseFilter* filter,
-                                                 PIN_DIRECTION pin_dir,
-                                                 REFGUID category,
-                                                 REFGUID major_type) {
-  ScopedComPtr<IPin> pin;
-  ScopedComPtr<IEnumPins> pin_enum;
+ComPtr<IPin> VideoCaptureDeviceWin::GetPin(IBaseFilter* filter,
+                                           PIN_DIRECTION pin_dir,
+                                           REFGUID category,
+                                           REFGUID major_type) {
+  ComPtr<IPin> pin;
+  ComPtr<IEnumPins> pin_enum;
   HRESULT hr = filter->EnumPins(pin_enum.GetAddressOf());
   if (pin_enum.Get() == NULL)
     return pin;
@@ -472,7 +471,7 @@ bool VideoCaptureDeviceWin::Init() {
   // require certain filters upstream from the WDM Video Capture filter, such as
   // a TV Tuner filter or an Analog Video Crossbar filter. We try using the more
   // prevalent MEDIATYPE_Interleaved first.
-  base::win::ScopedComPtr<IAMStreamConfig> stream_config;
+  ComPtr<IAMStreamConfig> stream_config;
 
   hr = capture_graph_builder_->FindInterface(
       &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Interleaved, capture_filter_.Get(),
@@ -506,7 +505,7 @@ void VideoCaptureDeviceWin::AllocateAndStart(
       std::min(params.requested_format.frame_rate,
                found_capability.supported_format.frame_rate);
 
-  ScopedComPtr<IAMStreamConfig> stream_config;
+  ComPtr<IAMStreamConfig> stream_config;
   HRESULT hr = output_capture_pin_.CopyTo(stream_config.GetAddressOf());
   if (FAILED(hr)) {
     SetErrorState(FROM_HERE, "Can't get the Capture format settings", hr);
@@ -795,7 +794,7 @@ void VideoCaptureDeviceWin::SetPhotoOptions(
 }
 
 bool VideoCaptureDeviceWin::InitializeVideoAndCameraControls() {
-  base::win::ScopedComPtr<IKsTopologyInfo> info;
+  ComPtr<IKsTopologyInfo> info;
   HRESULT hr = capture_filter_.CopyTo(info.GetAddressOf());
   if (FAILED(hr)) {
     SetErrorState(FROM_HERE, "Failed to obtain the topology info.", hr);
@@ -876,7 +875,7 @@ void VideoCaptureDeviceWin::SetAntiFlickerInCaptureFilter(
       power_line_frequency != media::PowerLineFrequency::FREQUENCY_60HZ) {
     return;
   }
-  ScopedComPtr<IKsPropertySet> ks_propset;
+  ComPtr<IKsPropertySet> ks_propset;
   DWORD type_support = 0;
   HRESULT hr;
   if (SUCCEEDED(hr = capture_filter_.CopyTo(ks_propset.GetAddressOf())) &&