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

chrome/utility/importer/ie_importer_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 "chrome/utility/importer/ie_importer_win.h"
 
 #include <objbase.h>
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
@@ skipping 274 matching lines @@
   IEOrderBookmarkComparator compare = {&sort_index};
   std::sort(bookmarks->begin(), bookmarks->end(), compare);
 }
 
 // Reads an internet shortcut (*.url) |file| and returns a COM object
 // representing it.
 bool LoadInternetShortcut(
     const base::string16& file,
     base::win::ScopedComPtr<IUniformResourceLocator>* shortcut) {
   base::win::ScopedComPtr<IUniformResourceLocator> url_locator;
-  if (FAILED(url_locator.CreateInstance(CLSID_InternetShortcut, NULL,
-                                        CLSCTX_INPROC_SERVER)))
+  if (FAILED(::CoCreateInstance(CLSID_InternetShortcut, NULL,
+                                CLSCTX_INPROC_SERVER,
+                                IID_PPV_ARGS(&url_locator))))
     return false;
 
   base::win::ScopedComPtr<IPersistFile> persist_file;
   if (FAILED(url_locator.CopyTo(persist_file.GetAddressOf())))
     return false;
 
   // Loads the Internet Shortcut from persistent storage.
   if (FAILED(persist_file->Load(file.c_str(), STGM_READ)))
     return false;
 
@@ skipping 195 matching lines @@
 }
 
 void IEImporter::ImportHistory() {
   const std::string kSchemes[] = {url::kHttpScheme,
                                   url::kHttpsScheme,
                                   url::kFtpScheme,
                                   url::kFileScheme};
   int total_schemes = arraysize(kSchemes);
 
   base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
-  if (FAILED(url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
-                                             CLSCTX_INPROC_SERVER))) {
+  if (FAILED(::CoCreateInstance(CLSID_CUrlHistory, NULL, CLSCTX_INPROC_SERVER,
+                                IID_PPV_ARGS(&url_history_stg2)))) {
     return;
   }
   base::win::ScopedComPtr<IEnumSTATURL> enum_url;
   if (SUCCEEDED(url_history_stg2->EnumUrls(enum_url.GetAddressOf()))) {
     std::vector<ImporterURLRow> rows;
     STATURL stat_url;
 
     // IEnumSTATURL::Next() doesn't fill STATURL::dwFlags by default. Need to
     // call IEnumSTATURL::SetFilter() with STATURL_QUERYFLAG_TOPLEVEL flag to
     // specify how STATURL structure will be filled.
@@ skipping 388 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }