Remove ScopedComPtr::CreateInstance()

base/test/test_shortcut_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 "base/test/test_shortcut_win.h"
 
 #include <windows.h>
+#include <objbase.h>
 #include <shlobj.h>
 #include <propkey.h>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 37 matching lines @@
   wchar_t read_target[MAX_PATH] = {0};
   wchar_t read_working_dir[MAX_PATH] = {0};
   wchar_t read_arguments[MAX_PATH] = {0};
   wchar_t read_description[MAX_PATH] = {0};
   wchar_t read_icon[MAX_PATH] = {0};
   int read_icon_index = 0;
 
   HRESULT hr;
 
   // Initialize the shell interfaces.
-  EXPECT_TRUE(SUCCEEDED(hr = i_shell_link.CreateInstance(
-      CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER)));
+  EXPECT_TRUE(SUCCEEDED(hr = ::CoCreateInstance(CLSID_ShellLink, NULL,
+                                                CLSCTX_INPROC_SERVER,
+                                                IID_PPV_ARGS(&i_shell_link))));
   if (FAILED(hr))
     return;
 
   EXPECT_TRUE(
       SUCCEEDED(hr = i_shell_link.CopyTo(i_persist_file.GetAddressOf())));
   if (FAILED(hr))
     return;
 
   // Load the shortcut.
   EXPECT_TRUE(SUCCEEDED(hr = i_persist_file->Load(
@@ skipping 71 matching lines @@
           break;
         default:
           ADD_FAILURE() << "Unexpected variant type: " << pv_dual_mode.get().vt;
       }
     }
   }
 }
 
 }  // namespace win
 }  // namespace base