Migrate from ScopedComPtr::CreateInstance() to CoCreateInstance in chrome/...

chrome/browser/media_galleries/win/mtp_device_operations_util.cc

 // Copyright (c) 2013 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 "chrome/browser/media_galleries/win/mtp_device_operations_util.h"
 
+#include <objbase.h>
 #include <portabledevice.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_propvariant.h"
 #include "chrome/common/chrome_constants.h"
 
 namespace media_transfer_protocol {
 
 namespace {
 
 // On success, returns true and updates |client_info| with a reference to an
 // IPortableDeviceValues interface that holds information about the
 // application that communicates with the device.
 bool GetClientInformation(
     base::win::ScopedComPtr<IPortableDeviceValues>* client_info) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(client_info);
-  HRESULT hr = client_info->CreateInstance(__uuidof(PortableDeviceValues),
-                                           NULL, CLSCTX_INPROC_SERVER);
+  HRESULT hr = ::CoCreateInstance(__uuidof(PortableDeviceValues), NULL,
+                                  CLSCTX_INPROC_SERVER,
+                                  IID_PPV_ARGS(client_info->GetAddressOf()));
   if (FAILED(hr)) {
     DPLOG(ERROR) << "Failed to create an instance of IPortableDeviceValues";
     return false;
   }
 
   (*client_info)->SetStringValue(WPD_CLIENT_NAME,
                                  chrome::kBrowserProcessExecutableName);
   (*client_info)->SetUnsignedIntegerValue(WPD_CLIENT_MAJOR_VERSION, 0);
   (*client_info)->SetUnsignedIntegerValue(WPD_CLIENT_MINOR_VERSION, 0);
   (*client_info)->SetUnsignedIntegerValue(WPD_CLIENT_REVISION, 0);
@@ skipping 136 matching lines @@
       GetDeviceContent(device);
   if (!content.Get())
     return false;
 
   base::win::ScopedComPtr<IPortableDeviceProperties> properties;
   HRESULT hr = content->Properties(properties.GetAddressOf());
   if (FAILED(hr))
     return false;
 
   base::win::ScopedComPtr<IPortableDeviceKeyCollection> properties_to_read;
-  hr = properties_to_read.CreateInstance(__uuidof(PortableDeviceKeyCollection),
-                                         NULL,
-                                         CLSCTX_INPROC_SERVER);
+  hr = ::CoCreateInstance(__uuidof(PortableDeviceKeyCollection), NULL,
+                          CLSCTX_INPROC_SERVER,
+                          IID_PPV_ARGS(&properties_to_read));
   if (FAILED(hr))
     return false;
 
   if (FAILED(properties_to_read->Add(WPD_OBJECT_CONTENT_TYPE)) ||
       FAILED(properties_to_read->Add(WPD_OBJECT_FORMAT)) ||
       FAILED(properties_to_read->Add(WPD_OBJECT_ORIGINAL_FILE_NAME)) ||
       FAILED(properties_to_read->Add(WPD_OBJECT_NAME)) ||
       FAILED(properties_to_read->Add(WPD_OBJECT_DATE_MODIFIED)) ||
       FAILED(properties_to_read->Add(WPD_OBJECT_DATE_CREATED)) ||
       FAILED(properties_to_read->Add(WPD_OBJECT_SIZE)))
@@ skipping 96 matching lines @@
 }  // namespace
 
 base::win::ScopedComPtr<IPortableDevice> OpenDevice(
     const base::string16& pnp_device_id) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(!pnp_device_id.empty());
   base::win::ScopedComPtr<IPortableDeviceValues> client_info;
   if (!GetClientInformation(&client_info))
     return base::win::ScopedComPtr<IPortableDevice>();
   base::win::ScopedComPtr<IPortableDevice> device;
-  HRESULT hr = device.CreateInstance(__uuidof(PortableDevice), NULL,
-                                     CLSCTX_INPROC_SERVER);
+  HRESULT hr = ::CoCreateInstance(__uuidof(PortableDevice), NULL,
+                                  CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&device));
   if (FAILED(hr))
     return base::win::ScopedComPtr<IPortableDevice>();
 
   hr = device->Open(pnp_device_id.c_str(), client_info.Get());
   if (SUCCEEDED(hr))
     return device;
   if (hr == E_ACCESSDENIED)
     DPLOG(ERROR) << "Access denied to open the device";
   return base::win::ScopedComPtr<IPortableDevice>();
 }
@@ skipping 83 matching lines @@
       object_entries.empty())
     return base::string16();
   // TODO(thestig): This DCHECK can fail. Multiple MTP objects can have
   // the same name. Handle the situation gracefully. Refer to crbug.com/169930
   // for more details.
   DCHECK_EQ(1U, object_entries.size());
   return object_entries[0].object_id;
 }
 
 }  // namespace media_transfer_protocol