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

chrome/browser/importer/ie_importer_browsertest_win.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.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
+#include <objbase.h>
 #include <propvarutil.h>
 #include <shlguid.h>
 #include <shlobj.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <urlhist.h>
 
 #include <algorithm>
 #include <vector>
 
@@ skipping 144 matching lines @@
       ERROR_SUCCESS) {
     return false;
   }
   return true;
 }
 
 bool CreateUrlFileWithFavicon(const base::FilePath& file,
                               const base::string16& url,
                               const base::string16& favicon_url) {
   base::win::ScopedComPtr<IUniformResourceLocator> locator;
-  HRESULT result = locator.CreateInstance(CLSID_InternetShortcut, NULL,
-                                          CLSCTX_INPROC_SERVER);
+  HRESULT result =
+      ::CoCreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER,
+                         IID_PPV_ARGS(&locator));
   if (FAILED(result))
     return false;
   base::win::ScopedComPtr<IPersistFile> persist_file;
   result = locator.CopyTo(persist_file.GetAddressOf());
   if (FAILED(result))
     return false;
   result = locator->SetURL(url.c_str(), 0);
   if (FAILED(result))
     return false;
 
@@ skipping 296 matching lines @@
     L"a",
     L"SubFolder.url",
   };
   ASSERT_TRUE(CreateOrderBlob(
       base::FilePath(path), L"",
       std::vector<base::string16>(root_links,
                                   root_links + arraysize(root_links))));
 
   // Sets up a special history link.
   base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
-  ASSERT_EQ(S_OK, url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
-                                                  CLSCTX_INPROC_SERVER));
+  ASSERT_EQ(S_OK,
+            ::CoCreateInstance(CLSID_CUrlHistory, NULL, CLSCTX_INPROC_SERVER,
+                               IID_PPV_ARGS(&url_history_stg2)));
   // Usage of ADDURL_ADDTOHISTORYANDCACHE and ADDURL_ADDTOCACHE flags
   // is explained in the article:
   // http://msdn.microsoft.com/ru-ru/aa767730
   ASSERT_EQ(S_OK, url_history_stg2->AddUrl(kIEIdentifyUrl, kIEIdentifyTitle,
                                            ADDURL_ADDTOHISTORYANDCACHE));
   ASSERT_EQ(S_OK, url_history_stg2->AddUrl(kIECacheItemUrl, kIECacheItemTitle,
                                            ADDURL_ADDTOCACHE));
 
   // Starts to import the above settings.
   // Deletes itself.
@@ skipping 139 matching lines @@
   source_profile.source_path = temp_dir_.GetPath();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HOME_PAGE,
       observer);
   base::RunLoop().Run();
 }