chrome: Replace uses of ComPtr::GetAddressOf() with ComPtr::operator&

Microsoft::WRL::ComPtr<T>::GetAddressOf() is banned due to the ease
of causing memory leaks.

Also replace CopyTo(foo.GetAddressOf()) with As(&foo) since CopyTo(&foo)
does not work if we are copying to different interfaces.

Also replace QueryInterface(foo.GetAddressOf()) with
QueryInterface(IID_PPV_ARGS(&foo)).

Bug: 914910
Change-Id: Iab2499f6c5348afab8e3b5b7a88be7553a035dab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2271074
Reviewed-by: Robert Liao <robliao@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786618}

Author: xhwang-chromium

chrome/browser/download/trusted_sources_manager_win.cc

@@ -29,8 +29,7 @@ TrustedSourcesManagerWin::~TrustedSourcesManagerWin() = default;
 
 bool TrustedSourcesManagerWin::IsFromTrustedSource(const GURL& url) const {
   Microsoft::WRL::ComPtr<IInternetSecurityManager> security_manager;
-  HRESULT hr = ::CoInternetCreateSecurityManager(
-      NULL, security_manager.GetAddressOf(), NULL);
+  HRESULT hr = ::CoInternetCreateSecurityManager(NULL, &security_manager, NULL);
   // URLZONE_LOCAL_MACHINE 0
   // URLZONE_INTRANET      1
   // URLZONE_TRUSTED       2

chrome/browser/google/google_update_win.cc

@@ -199,8 +199,8 @@ HRESULT CreateGoogleUpdate3WebClass(
 
   ConfigureProxyBlanket(class_factory.Get());
 
-  return class_factory->CreateInstance(
-      nullptr, IID_PPV_ARGS(google_update->GetAddressOf()));
+  return class_factory->CreateInstance(nullptr,
+                                       IID_PPV_ARGS(&(*google_update)));
 }
 
 // Returns the process-wide storage for the state of the last update check.
@@ -567,10 +567,10 @@ UpdateCheckResult UpdateCheckDriver::BeginUpdateCheckInternal() {
   if (!app_bundle_) {
     Microsoft::WRL::ComPtr<IAppBundleWeb> app_bundle;
     Microsoft::WRL::ComPtr<IDispatch> dispatch;
-    hresult = google_update_->createAppBundleWeb(dispatch.GetAddressOf());
+    hresult = google_update_->createAppBundleWeb(&dispatch);
     if (FAILED(hresult))
       return {error_code, hresult};
-    hresult = dispatch.CopyTo(app_bundle.GetAddressOf());
+    hresult = dispatch.As(&app_bundle);
     if (FAILED(hresult))
       return {error_code, hresult};
     dispatch.Reset();
@@ -614,11 +614,11 @@ UpdateCheckResult UpdateCheckDriver::BeginUpdateCheckInternal() {
     // this point onward result in it being released.
     Microsoft::WRL::ComPtr<IAppBundleWeb> app_bundle;
     app_bundle.Swap(app_bundle_);
-    hresult = app_bundle->get_appWeb(0, dispatch.GetAddressOf());
+    hresult = app_bundle->get_appWeb(0, &dispatch);
     if (FAILED(hresult))
       return {error_code, hresult};
     Microsoft::WRL::ComPtr<IAppWeb> app;
-    hresult = dispatch.CopyTo(app.GetAddressOf());
+    hresult = dispatch.As(&app);
     if (FAILED(hresult))
       return {error_code, hresult};
     ConfigureProxyBlanket(app.Get());
@@ -637,10 +637,10 @@ bool UpdateCheckDriver::GetCurrentState(
     CurrentState* state_value,
     HRESULT* hresult) const {
   Microsoft::WRL::ComPtr<IDispatch> dispatch;
-  *hresult = app_->get_currentState(dispatch.GetAddressOf());
+  *hresult = app_->get_currentState(&dispatch);
   if (FAILED(*hresult))
     return false;
-  *hresult = dispatch.CopyTo(current_state->GetAddressOf());
+  *hresult = dispatch.As(&(*current_state));
   if (FAILED(*hresult))
     return false;
   ConfigureProxyBlanket(current_state->Get());

chrome/browser/importer/ie_importer_browsertest_win.cc

@@ -174,7 +174,7 @@ bool CreateUrlFileWithFavicon(const base::FilePath& file,
   if (FAILED(result))
     return false;
   Microsoft::WRL::ComPtr<IPersistFile> persist_file;
-  result = locator.CopyTo(persist_file.GetAddressOf());
+  result = locator.As(&persist_file);
   if (FAILED(result))
     return false;
   result = locator->SetURL(url.c_str(), 0);
@@ -184,11 +184,11 @@ bool CreateUrlFileWithFavicon(const base::FilePath& file,
   // Write favicon url if specified.
   if (!favicon_url.empty()) {
     Microsoft::WRL::ComPtr<IPropertySetStorage> property_set_storage;
-    if (FAILED(locator.CopyTo(property_set_storage.GetAddressOf())))
+    if (FAILED(locator.As(&property_set_storage)))
       return false;
     Microsoft::WRL::ComPtr<IPropertyStorage> property_storage;
     if (FAILED(property_set_storage->Open(FMTID_Intshcut, STGM_WRITE,
-                                          property_storage.GetAddressOf()))) {
+                                          &property_storage))) {
       return false;
     }
     PROPSPEC properties[] = {{PRSPEC_PROPID, {PID_IS_ICONFILE}}};

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc

@@ -247,8 +247,7 @@ base::File::Error GetFileStreamOnBlockingPoolThread(
   Microsoft::WRL::ComPtr<IStream> file_stream;
   if (file_info.size > 0) {
     HRESULT hr = media_transfer_protocol::GetFileStreamForObject(
-        device, file_object_id, file_stream.GetAddressOf(),
-        &optimal_transfer_size);
+        device, file_object_id, &file_stream, &optimal_transfer_size);
     if (hr != S_OK)
       return base::File::FILE_ERROR_FAILED;
   }

chrome/browser/media_galleries/win/mtp_device_operations_util.cc

@@ -35,9 +35,9 @@ bool GetClientInformation(
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
   DCHECK(client_info);
-  HRESULT hr = ::CoCreateInstance(__uuidof(PortableDeviceValues), NULL,
-                                  CLSCTX_INPROC_SERVER,
-                                  IID_PPV_ARGS(client_info->GetAddressOf()));
+  HRESULT hr =
+      ::CoCreateInstance(__uuidof(PortableDeviceValues), NULL,
+                         CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&(*client_info)));
   if (FAILED(hr)) {
     DPLOG(ERROR) << "Failed to create an instance of IPortableDeviceValues";
     return false;
@@ -63,7 +63,7 @@ Microsoft::WRL::ComPtr<IPortableDeviceContent> GetDeviceContent(
                                                 base::BlockingType::MAY_BLOCK);
   DCHECK(device);
   Microsoft::WRL::ComPtr<IPortableDeviceContent> content;
-  if (SUCCEEDED(device->Content(content.GetAddressOf())))
+  if (SUCCEEDED(device->Content(&content)))
     return content;
   return Microsoft::WRL::ComPtr<IPortableDeviceContent>();
 }
@@ -84,8 +84,8 @@ Microsoft::WRL::ComPtr<IEnumPortableDeviceObjectIDs> GetDeviceObjectEnumerator(
     return Microsoft::WRL::ComPtr<IEnumPortableDeviceObjectIDs>();
 
   Microsoft::WRL::ComPtr<IEnumPortableDeviceObjectIDs> enum_object_ids;
-  if (SUCCEEDED(content->EnumObjects(0, parent_id.c_str(), NULL,
-                                     enum_object_ids.GetAddressOf())))
+  if (SUCCEEDED(
+          content->EnumObjects(0, parent_id.c_str(), NULL, &enum_object_ids)))
     return enum_object_ids;
   return Microsoft::WRL::ComPtr<IEnumPortableDeviceObjectIDs>();
 }
@@ -192,7 +192,7 @@ bool GetObjectDetails(IPortableDevice* device,
     return false;
 
   Microsoft::WRL::ComPtr<IPortableDeviceProperties> properties;
-  HRESULT hr = content->Properties(properties.GetAddressOf());
+  HRESULT hr = content->Properties(&properties);
   if (FAILED(hr))
     return false;
 
@@ -214,7 +214,7 @@ bool GetObjectDetails(IPortableDevice* device,
 
   Microsoft::WRL::ComPtr<IPortableDeviceValues> properties_values;
   hr = properties->GetValues(object_id.c_str(), properties_to_read.Get(),
-                             properties_values.GetAddressOf());
+                             &properties_values);
   if (FAILED(hr))
     return false;
 
@@ -373,7 +373,7 @@ HRESULT GetFileStreamForObject(IPortableDevice* device,
     return E_FAIL;
 
   Microsoft::WRL::ComPtr<IPortableDeviceResources> resources;
-  HRESULT hr = content->Transfer(resources.GetAddressOf());
+  HRESULT hr = content->Transfer(&resources);
   if (FAILED(hr))
     return hr;
   return resources->GetStream(file_object_id.c_str(), WPD_RESOURCE_DEFAULT,

chrome/browser/notifications/notification_platform_bridge_win.cc

@@ -83,12 +83,13 @@ typedef winfoundtn::ITypedEventHandler<
     ToastFailedHandler;
 
 // Templated wrapper for winfoundtn::GetActivationFactory().
-template <unsigned int size, typename T>
-HRESULT CreateActivationFactory(wchar_t const (&class_name)[size], T** object) {
+template <unsigned int size>
+HRESULT CreateActivationFactory(wchar_t const (&class_name)[size],
+                                const IID& iid,
+                                void** factory) {
   ScopedHString ref_class_name =
       ScopedHString::Create(base::StringPiece16(class_name, size - 1));
-  return base::win::RoGetActivationFactory(ref_class_name.get(),
-                                           IID_PPV_ARGS(object));
+  return base::win::RoGetActivationFactory(ref_class_name.get(), iid, factory);
 }
 
 void ForwardNotificationOperationOnUiThread(
@@ -180,7 +181,7 @@ class NotificationPlatformBridgeWinImpl
     }
 
     mswr::ComPtr<winxml::Dom::IXmlDocumentIO> document_io;
-    hr = inspectable.As<winxml::Dom::IXmlDocumentIO>(&document_io);
+    hr = inspectable.As(&document_io);
     if (FAILED(hr)) {
       LogDisplayHistogram(
           DisplayStatus::CONVERSION_FAILED_INSPECTABLE_TO_XML_IO);
@@ -210,7 +211,7 @@ class NotificationPlatformBridgeWinImpl
         toast_notification_factory;
     hr = CreateActivationFactory(
         RuntimeClass_Windows_UI_Notifications_ToastNotification,
-        toast_notification_factory.GetAddressOf());
+        IID_PPV_ARGS(&toast_notification_factory));
     if (FAILED(hr)) {
       LogDisplayHistogram(DisplayStatus::CREATE_FACTORY_FAILED);
       DLOG(ERROR) << "Unable to create the IToastNotificationFactory "
@@ -220,7 +221,7 @@ class NotificationPlatformBridgeWinImpl
 
     mswr::ComPtr<winui::Notifications::IToastNotification> toast_notification;
     hr = toast_notification_factory->CreateToastNotification(
-        document.Get(), toast_notification.GetAddressOf());
+        document.Get(), &toast_notification);
     if (FAILED(hr)) {
       LogDisplayHistogram(DisplayStatus::CREATE_TOAST_NOTIFICATION_FAILED);
       DLOG(ERROR) << "Unable to create the IToastNotification " << std::hex
@@ -436,7 +437,7 @@ class NotificationPlatformBridgeWinImpl
         toast_manager;
     HRESULT hr = CreateActivationFactory(
         RuntimeClass_Windows_UI_Notifications_ToastNotificationManager,
-        toast_manager.GetAddressOf());
+        IID_PPV_ARGS(&toast_manager));
     if (FAILED(hr)) {
       LogHistoryHistogram(
           HistoryStatus::CREATE_TOAST_NOTIFICATION_MANAGER_FAILED);
@@ -447,9 +448,7 @@ class NotificationPlatformBridgeWinImpl
 
     mswr::ComPtr<winui::Notifications::IToastNotificationManagerStatics2>
         toast_manager2;
-    hr = toast_manager
-             .As<winui::Notifications::IToastNotificationManagerStatics2>(
-                 &toast_manager2);
+    hr = toast_manager.As(&toast_manager2);
     if (FAILED(hr)) {
       LogHistoryHistogram(
           HistoryStatus::QUERY_TOAST_MANAGER_STATISTICS2_FAILED);
@@ -460,7 +459,7 @@ class NotificationPlatformBridgeWinImpl
 
     mswr::ComPtr<winui::Notifications::IToastNotificationHistory>
         notification_history;
-    hr = toast_manager2->get_History(notification_history.GetAddressOf());
+    hr = toast_manager2->get_History(&notification_history);
     if (FAILED(hr)) {
       LogHistoryHistogram(HistoryStatus::GET_TOAST_HISTORY_FAILED);
       DLOG(ERROR) << "Failed to get IToastNotificationHistory " << std::hex
@@ -484,8 +483,7 @@ class NotificationPlatformBridgeWinImpl
     }
 
     mswr::ComPtr<winui::Notifications::IToastNotificationHistory2> history2;
-    HRESULT hr =
-        history.As<winui::Notifications::IToastNotificationHistory2>(&history2);
+    HRESULT hr = history.As(&history2);
     if (FAILED(hr)) {
       LogGetDisplayedStatus(
           GetDisplayedStatus::QUERY_TOAST_NOTIFICATION_HISTORY2_FAILED);
@@ -779,7 +777,7 @@ class NotificationPlatformBridgeWinImpl
         toast_manager;
     HRESULT hr = CreateActivationFactory(
         RuntimeClass_Windows_UI_Notifications_ToastNotificationManager,
-        toast_manager.GetAddressOf());
+        IID_PPV_ARGS(&toast_manager));
     if (FAILED(hr)) {
       LogDisplayHistogram(
           DisplayStatus::CREATE_TOAST_NOTIFICATION_MANAGER_FAILED);

chrome/browser/notifications/win/fake_itoastnotification.cc

@@ -22,8 +22,8 @@ HRESULT FakeIToastNotification::get_Content(winxml::Dom::IXmlDocument** value) {
   mswr::ComPtr<winxml::Dom::IXmlDocumentIO> xml_document_io;
   base::win::ScopedHString id = base::win::ScopedHString::Create(
       RuntimeClass_Windows_Data_Xml_Dom_XmlDocument);
-  HRESULT hr = Windows::Foundation::ActivateInstance(
-      id.get(), xml_document_io.GetAddressOf());
+  HRESULT hr =
+      Windows::Foundation::ActivateInstance(id.get(), &xml_document_io);
   if (FAILED(hr)) {
     LOG(ERROR) << "Unable to instantiate XMLDocumentIO " << hr;
     return hr;
@@ -37,7 +37,7 @@ HRESULT FakeIToastNotification::get_Content(winxml::Dom::IXmlDocument** value) {
   }
 
   mswr::ComPtr<winxml::Dom::IXmlDocument> xml_document;
-  hr = xml_document_io.CopyTo(xml_document.GetAddressOf());
+  hr = xml_document_io.As(&xml_document);
   if (FAILED(hr)) {
     LOG(ERROR) << "Unable to copy to XMLDoc " << hr;
     return hr;

chrome/browser/platform_util_win.cc

@@ -46,7 +46,7 @@ void ShowItemInFolderOnWorkerThread(const base::FilePath& full_path) {
     return;
 
   Microsoft::WRL::ComPtr<IShellFolder> desktop;
-  HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
+  HRESULT hr = SHGetDesktopFolder(&desktop);
   if (FAILED(hr))
     return;
 

chrome/browser/shell_integration_win.cc

@@ -837,7 +837,7 @@ int MigrateShortcutsInPathInternal(const base::FilePath& chrome_exe,
     Microsoft::WRL::ComPtr<IPersistFile> persist_file;
     if (FAILED(::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
                                   IID_PPV_ARGS(&shell_link))) ||
-        FAILED(shell_link.CopyTo(persist_file.GetAddressOf())) ||
+        FAILED(shell_link.As(&persist_file)) ||
         FAILED(persist_file->Load(shortcut.value().c_str(), STGM_READ))) {
       DLOG(WARNING) << "Failed loading shortcut at " << shortcut.value();
       continue;
@@ -850,7 +850,7 @@ int MigrateShortcutsInPathInternal(const base::FilePath& chrome_exe,
     // Validate the existing app id for the shortcut.
     Microsoft::WRL::ComPtr<IPropertyStore> property_store;
     propvariant.Reset();
-    if (FAILED(shell_link.CopyTo(property_store.GetAddressOf())) ||
+    if (FAILED(shell_link.As(&property_store)) ||
         property_store->GetValue(PKEY_AppUserModel_ID, propvariant.Receive()) !=
             S_OK) {
       // When in doubt, prefer not updating the shortcut.

chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc

@@ -122,9 +122,9 @@ void WinAccessibilityEventMonitor::WaitForNextEvent(
 
   Microsoft::WRL::ComPtr<IAccessible> acc_obj;
   base::win::ScopedVariant child_variant;
-  CHECK(S_OK == AccessibleObjectFromEvent(
-                    event_info.hwnd, event_info.obj_id, event_info.child_id,
-                    acc_obj.GetAddressOf(), child_variant.Receive()));
+  CHECK(S_OK == AccessibleObjectFromEvent(event_info.hwnd, event_info.obj_id,
+                                          event_info.child_id, &acc_obj,
+                                          child_variant.Receive()));
 
   base::win::ScopedVariant role_variant;
   if (S_OK == acc_obj->get_accRole(child_variant, role_variant.Receive()))

chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc

@@ -116,14 +116,14 @@ bool StatusTrayStateChangerWin::CreateTrayNotify() {
     return false;
 
   Microsoft::WRL::ComPtr<ITrayNotifyWin8> tray_notify_win8;
-  hr = tray_notify_.CopyTo(tray_notify_win8.GetAddressOf());
+  hr = tray_notify_.As(&tray_notify_win8);
   if (SUCCEEDED(hr)) {
     interface_version_ = INTERFACE_VERSION_WIN8;
     return true;
   }
 
   Microsoft::WRL::ComPtr<ITrayNotify> tray_notify_legacy;
-  hr = tray_notify_.CopyTo(tray_notify_legacy.GetAddressOf());
+  hr = tray_notify_.As(&tray_notify_legacy);
   if (SUCCEEDED(hr)) {
     interface_version_ = INTERFACE_VERSION_LEGACY;
     return true;
@@ -158,7 +158,7 @@ std::unique_ptr<NOTIFYITEM> StatusTrayStateChangerWin::RegisterCallback() {
 
 bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
   Microsoft::WRL::ComPtr<ITrayNotifyWin8> tray_notify_win8;
-  HRESULT hr = tray_notify_.CopyTo(tray_notify_win8.GetAddressOf());
+  HRESULT hr = tray_notify_.As(&tray_notify_win8);
   if (FAILED(hr))
     return false;
 
@@ -178,7 +178,7 @@ bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
 
 bool StatusTrayStateChangerWin::RegisterCallbackLegacy() {
   Microsoft::WRL::ComPtr<ITrayNotify> tray_notify;
-  HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
+  HRESULT hr = tray_notify_.As(&tray_notify);
   if (FAILED(hr)) {
     return false;
   }
@@ -205,12 +205,12 @@ void StatusTrayStateChangerWin::SendNotifyItemUpdate(
     std::unique_ptr<NOTIFYITEM> notify_item) {
   if (interface_version_ == INTERFACE_VERSION_LEGACY) {
     Microsoft::WRL::ComPtr<ITrayNotify> tray_notify;
-    HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
+    HRESULT hr = tray_notify_.As(&tray_notify);
     if (SUCCEEDED(hr))
       tray_notify->SetPreference(notify_item.get());
   } else if (interface_version_ == INTERFACE_VERSION_WIN8) {
     Microsoft::WRL::ComPtr<ITrayNotifyWin8> tray_notify;
-    HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
+    HRESULT hr = tray_notify_.As(&tray_notify);
     if (SUCCEEDED(hr))
       tray_notify->SetPreference(notify_item.get());
   }