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

chrome/browser/win/jumplist_updater.cc

 // Copyright 2014 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/win/jumplist_updater.h"
 
 #include <windows.h>
 #include <objbase.h>
 #include <propkey.h>
 #include <shobjidl.h>
@@ skipping 10 matching lines @@
 
 // Creates an IShellLink object.
 // An IShellLink object is almost the same as an application shortcut, and it
 // requires three items: the absolute path to an application, an argument
 // string, and a title string.
 bool AddShellLink(base::win::ScopedComPtr<IObjectCollection> collection,
                   const base::string16& application_path,
                   scoped_refptr<ShellLinkItem> item) {
   // Create an IShellLink object.
   base::win::ScopedComPtr<IShellLink> link;
-  HRESULT result = link.CreateInstance(CLSID_ShellLink, NULL,
-                                       CLSCTX_INPROC_SERVER);
+  HRESULT result = ::CoCreateInstance(
+      CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&link));
   if (FAILED(result))
     return false;
 
   // Set the application path.
   // We should exit this function when this call fails because it doesn't make
   // any sense to add a shortcut that we cannot execute.
   result = link->SetPath(application_path.c_str());
   if (FAILED(result))
     return false;
 
@@ skipping 75 matching lines @@
   SCOPED_UMA_HISTOGRAM_TIMER("WinJumplistUpdater.BeginUpdateDuration");
 
   // This instance is expected to be one-time-use only.
   DCHECK(!destination_list_.Get());
 
   // Check preconditions.
   if (!JumpListUpdater::IsEnabled() || app_user_model_id_.empty())
     return false;
 
   // Create an ICustomDestinationList object and attach it to our application.
-  HRESULT result = destination_list_.CreateInstance(CLSID_DestinationList, NULL,
-                                                    CLSCTX_INPROC_SERVER);
+  HRESULT result =
+      ::CoCreateInstance(CLSID_DestinationList, NULL, CLSCTX_INPROC_SERVER,
+                         IID_PPV_ARGS(&destination_list_));
   if (FAILED(result))
     return false;
 
   // Set the App ID for this JumpList.
   result = destination_list_->SetAppID(app_user_model_id_.c_str());
   if (FAILED(result))
     return false;
 
   // Start a transaction that updates the JumpList of this application.
   // This implementation just replaces the all items in this JumpList, so
@@ skipping 30 matching lines @@
     return false;
 
   // Retrieve the absolute path to "chrome.exe".
   base::FilePath application_path;
   if (!PathService::Get(base::FILE_EXE, &application_path))
     return false;
 
   // Create an EnumerableObjectCollection object to be added items of the
   // "Task" category.
   base::win::ScopedComPtr<IObjectCollection> collection;
-  HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
-                                             NULL, CLSCTX_INPROC_SERVER);
+  HRESULT result =
+      ::CoCreateInstance(CLSID_EnumerableObjectCollection, NULL,
+                         CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&collection));
   if (FAILED(result))
     return false;
 
   // Add items to the "Task" category.
   for (ShellLinkItemList::const_iterator it = link_items.begin();
        it != link_items.end(); ++it) {
     if (!AddShellLink(collection, application_path.value(), *it))
       return false;
   }
 
@@ skipping 26 matching lines @@
   // Exit this function when the given vector does not contain any items
   // because an ICustomDestinationList::AppendCategory() call fails in this
   // case.
   if (link_items.empty() || !max_items)
     return true;
 
   // Create an EnumerableObjectCollection object.
   // We once add the given items to this collection object and add this
   // collection to the JumpList.
   base::win::ScopedComPtr<IObjectCollection> collection;
-  HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
-                                             NULL, CLSCTX_INPROC_SERVER);
+  HRESULT result =
+      ::CoCreateInstance(CLSID_EnumerableObjectCollection, NULL,
+                         CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&collection));
   if (FAILED(result))
     return false;
 
   for (ShellLinkItemList::const_iterator item = link_items.begin();
        item != link_items.end() && max_items > 0; ++item, --max_items) {
     if (!AddShellLink(collection, application_path.value(), *item))
       return false;
   }
 
   // We can now add the new list to the JumpList.
   // The ICustomDestinationList::AppendCategory() function needs the
   // IObjectArray interface to retrieve each item in the list. So, we retrive
   // the IObjectArray interface from the IEnumerableObjectCollection object
   // and use it.
   // It seems the ICustomDestinationList::AppendCategory() function just
   // replaces all items in the given category with the ones in the new list.
   base::win::ScopedComPtr<IObjectArray> object_array;
   result = collection.CopyTo(object_array.GetAddressOf());
   if (FAILED(result))
     return false;
 
   return SUCCEEDED(destination_list_->AppendCategory(category_name.c_str(),
                                                      object_array.Get()));
 }