Remove ScopedComPtr::CreateInstance()

media/audio/win/core_audio_util_win.cc

 // Copyright (c) 2012 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.
 
 #include "media/audio/win/core_audio_util_win.h"
 
 #include <devicetopology.h>
 #include <dxdiag.h>
 #include <functiondiscoverykeys_devpkey.h>
 #include <objbase.h>
@@ skipping 159 matching lines @@
     base::WideToUTF8(friendly_name_pv.get().pwszVal,
                      wcslen(friendly_name_pv.get().pwszVal), friendly_name);
   }
 
   return hr;
 }
 
 static ScopedComPtr<IMMDeviceEnumerator> CreateDeviceEnumeratorInternal(
     bool allow_reinitialize) {
   ScopedComPtr<IMMDeviceEnumerator> device_enumerator;
-  HRESULT hr = device_enumerator.CreateInstance(__uuidof(MMDeviceEnumerator),
-                                                NULL, CLSCTX_INPROC_SERVER);
+  HRESULT hr = ::CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL,
+                                  CLSCTX_INPROC_SERVER,
+                                  IID_PPV_ARGS(&device_enumerator));
   if (hr == CO_E_NOTINITIALIZED && allow_reinitialize) {
     LOG(ERROR) << "CoCreateInstance fails with CO_E_NOTINITIALIZED";
     // We have seen crashes which indicates that this method can in fact
     // fail with CO_E_NOTINITIALIZED in combination with certain 3rd party
     // modules. Calling CoInitializeEx is an attempt to resolve the reported
     // issues. See http://crbug.com/378465 for details.
     hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
     if (SUCCEEDED(hr)) {
-      hr = device_enumerator.CreateInstance(__uuidof(MMDeviceEnumerator),
-                                            NULL, CLSCTX_INPROC_SERVER);
+      hr = ::CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL,
+                              CLSCTX_INPROC_SERVER,
+                              IID_PPV_ARGS(&device_enumerator));
     }
   }
   return device_enumerator;
 }
 
 static bool IsSupportedInternal() {
   // It is possible to force usage of WaveXxx APIs by using a command line flag.
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kForceWaveAudio)) {
     DVLOG(1) << "Forcing usage of Windows WaveXxx APIs";
@@ skipping 668 matching lines @@
   // explicitly write silence data to the rendering buffer.
   DVLOG(2) << "filling up " << num_frames_to_fill << " frames with silence";
   return SUCCEEDED(render_client->ReleaseBuffer(num_frames_to_fill,
                                                 AUDCLNT_BUFFERFLAGS_SILENT));
 }
 
 bool CoreAudioUtil::GetDxDiagDetails(std::string* driver_name,
                                      std::string* driver_version) {
   ScopedComPtr<IDxDiagProvider, &IID_IDxDiagProvider> provider;
   HRESULT hr =
-      provider.CreateInstance(CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER);
+      ::CoCreateInstance(CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER,
+                         IID_IDxDiagProvider, &provider);
   if (FAILED(hr))
     return false;
 
   DXDIAG_INIT_PARAMS params = {sizeof(params)};
   params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION;
   params.bAllowWHQLChecks = FALSE;
   params.pReserved = NULL;
   hr = provider->Initialize(&params);
   if (FAILED(hr))
     return false;
@@ skipping 28 matching lines @@
 
   if (variant.type() == VT_BSTR && variant.ptr()->bstrVal) {
     base::WideToUTF8(variant.ptr()->bstrVal, wcslen(variant.ptr()->bstrVal),
                      driver_version);
   }
 
   return true;
 }
 
 }  // namespace media