Remove Interface ID Template Parameter from ScopedComPtr

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 859 matching lines @@
 
   // Using the AUDCLNT_BUFFERFLAGS_SILENT flag eliminates the need to
   // 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;
+  ScopedComPtr<IDxDiagProvider> provider;
   HRESULT hr =
       ::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;
 
-  ScopedComPtr<IDxDiagContainer, &IID_IDxDiagContainer> root;
+  ScopedComPtr<IDxDiagContainer> root;
   hr = provider->GetRootContainer(root.GetAddressOf());
   if (FAILED(hr))
     return false;
 
   // Limit to the SoundDevices subtree. The tree in its entirity is
   // enormous and only this branch contains useful information.
-  ScopedComPtr<IDxDiagContainer, &IID_IDxDiagContainer> sound_devices;
+  ScopedComPtr<IDxDiagContainer> sound_devices;
   hr = root->GetChildContainer(L"DxDiag_DirectSound.DxDiag_SoundDevices.0",
                                sound_devices.GetAddressOf());
   if (FAILED(hr))
     return false;
 
   base::win::ScopedVariant variant;
   hr = sound_devices->GetProp(L"szDriverName", variant.Receive());
   if (FAILED(hr))
     return false;
 
   if (variant.type() == VT_BSTR && variant.ptr()->bstrVal) {
     base::WideToUTF8(variant.ptr()->bstrVal, wcslen(variant.ptr()->bstrVal),
                      driver_name);
   }
 
   variant.Reset();
   hr = sound_devices->GetProp(L"szDriverVersion", variant.Receive());
   if (FAILED(hr))
     return false;
 
   if (variant.type() == VT_BSTR && variant.ptr()->bstrVal) {
     base::WideToUTF8(variant.ptr()->bstrVal, wcslen(variant.ptr()->bstrVal),
                      driver_version);
   }
 
   return true;
 }
 
 }  // namespace media