Remove ScopedComPtr::CreateInstance()

base/win/shortcut.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 "base/win/shortcut.h"
 
+#include <objbase.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <propkey.h>
 
 #include "base/files/file_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 
 namespace base {
 namespace win {
 
 namespace {
 
 // Initializes |i_shell_link| and |i_persist_file| (releasing them first if they
 // are already initialized).
 // If |shortcut| is not NULL, loads |shortcut| into |i_persist_file|.
 // If any of the above steps fail, both |i_shell_link| and |i_persist_file| will
 // be released.
 void InitializeShortcutInterfaces(
     const wchar_t* shortcut,
     ScopedComPtr<IShellLink>* i_shell_link,
     ScopedComPtr<IPersistFile>* i_persist_file) {
   i_shell_link->Reset();
   i_persist_file->Reset();
-  if (FAILED(i_shell_link->CreateInstance(CLSID_ShellLink, NULL,
-                                          CLSCTX_INPROC_SERVER)) ||
+  if (FAILED(::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+                                IID_PPV_ARGS(i_shell_link->GetAddressOf()))) ||
       FAILED(i_shell_link->CopyTo(i_persist_file->GetAddressOf())) ||
       (shortcut && FAILED((*i_persist_file)->Load(shortcut, STGM_READWRITE)))) {
     i_shell_link->Reset();
     i_persist_file->Reset();
   }
 }
 
 }  // namespace
 
 ShortcutProperties::ShortcutProperties()
@@ skipping 144 matching lines @@
                                ShortcutProperties* properties) {
   DCHECK(options && properties);
   base::ThreadRestrictions::AssertIOAllowed();
 
   if (options & ~ShortcutProperties::PROPERTIES_ALL)
     NOTREACHED() << "Unhandled property is used.";
 
   ScopedComPtr<IShellLink> i_shell_link;
 
   // Get pointer to the IShellLink interface.
-  if (FAILED(i_shell_link.CreateInstance(CLSID_ShellLink, NULL,
-                                         CLSCTX_INPROC_SERVER))) {
+  if (FAILED(::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+                                IID_PPV_ARGS(&i_shell_link)))) {
     return false;
   }
 
   ScopedComPtr<IPersistFile> persist;
   // Query IShellLink for the IPersistFile interface.
   if (FAILED(i_shell_link.CopyTo(persist.GetAddressOf())))
     return false;
 
   // Load the shell link.
   if (FAILED(persist->Load(shortcut_path.value().c_str(), STGM_READ)))
@@ skipping 128 matching lines @@
   if (GetVersion() < VERSION_WIN7)
     return false;
 
   intptr_t result = reinterpret_cast<intptr_t>(ShellExecute(
       NULL, L"taskbarunpin", shortcut.value().c_str(), NULL, NULL, 0));
   return result > 32;
 }
 
 }  // namespace win
 }  // namespace base