Remove ScopedComPtr::QueryFrom()

base/win/shortcut.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/win/shortcut.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 #include <propkey.h>
 
@@ skipping 15 matching lines @@
 // If any of the above steps fail, both |i_shell_link| and |i_persist_file| will
 // be released.
 void InitializeShortcutInterfaces(
     const wchar_t* shortcut,
     ScopedComPtr<IShellLink>* i_shell_link,
     ScopedComPtr<IPersistFile>* i_persist_file) {
   i_shell_link->Reset();
   i_persist_file->Reset();
   if (FAILED(i_shell_link->CreateInstance(CLSID_ShellLink, NULL,
                                           CLSCTX_INPROC_SERVER)) ||
-      FAILED(i_persist_file->QueryFrom(i_shell_link->Get())) ||
+      FAILED(i_shell_link->CopyTo(i_persist_file->GetAddressOf())) ||
       (shortcut && FAILED((*i_persist_file)->Load(shortcut, STGM_READWRITE)))) {
     i_shell_link->Reset();
     i_persist_file->Reset();
   }
 }
 
 }  // namespace
 
 ShortcutProperties::ShortcutProperties()
     : icon_index(-1), dual_mode(false), options(0U) {
@@ skipping 85 matching lines @@
     return false;
   }
 
   bool has_app_id =
       (properties.options & ShortcutProperties::PROPERTIES_APP_ID) != 0;
   bool has_dual_mode =
       (properties.options & ShortcutProperties::PROPERTIES_DUAL_MODE) != 0;
   if ((has_app_id || has_dual_mode) &&
       GetVersion() >= VERSION_WIN7) {
     ScopedComPtr<IPropertyStore> property_store;
-    if (FAILED(property_store.QueryFrom(i_shell_link.Get())) ||
+    if (FAILED(i_shell_link.CopyTo(property_store.GetAddressOf())) ||
         !property_store.Get())
       return false;
 
     if (has_app_id &&
         !SetAppIdForPropertyStore(property_store.Get(),
                                   properties.app_id.c_str())) {
       return false;
     }
     if (has_dual_mode &&
         !SetBooleanValueForPropertyStore(property_store.Get(),
@@ skipping 44 matching lines @@
   ScopedComPtr<IShellLink> i_shell_link;
 
   // Get pointer to the IShellLink interface.
   if (FAILED(i_shell_link.CreateInstance(CLSID_ShellLink, NULL,
                                          CLSCTX_INPROC_SERVER))) {
     return false;
   }
 
   ScopedComPtr<IPersistFile> persist;
   // Query IShellLink for the IPersistFile interface.
-  if (FAILED(persist.QueryFrom(i_shell_link.Get())))
+  if (FAILED(i_shell_link.CopyTo(persist.GetAddressOf())))
     return false;
 
   // Load the shell link.
   if (FAILED(persist->Load(shortcut_path.value().c_str(), STGM_READ)))
     return false;
 
   // Reset |properties|.
   properties->options = 0;
 
   wchar_t temp[MAX_PATH];
@@ skipping 26 matching lines @@
     int temp_index;
     if (FAILED(i_shell_link->GetIconLocation(temp, MAX_PATH, &temp_index)))
       return false;
     properties->set_icon(FilePath(temp), temp_index);
   }
 
   // Windows 7+ options, avoiding unnecessary work.
   if ((options & ShortcutProperties::PROPERTIES_WIN7) &&
       GetVersion() >= VERSION_WIN7) {
     ScopedComPtr<IPropertyStore> property_store;
-    if (FAILED(property_store.QueryFrom(i_shell_link.Get())))
+    if (FAILED(i_shell_link.CopyTo(property_store.GetAddressOf())))
       return false;
 
     if (options & ShortcutProperties::PROPERTIES_APP_ID) {
       ScopedPropVariant pv_app_id;
       if (property_store->GetValue(PKEY_AppUserModel_ID,
                                    pv_app_id.Receive()) != S_OK) {
         return false;
       }
       switch (pv_app_id.get().vt) {
         case VT_EMPTY:
@@ skipping 75 matching lines @@
   if (GetVersion() < VERSION_WIN7)
     return false;
 
   intptr_t result = reinterpret_cast<intptr_t>(ShellExecute(
       NULL, L"taskbarunpin", shortcut.value().c_str(), NULL, NULL, 0));
   return result > 32;
 }
 
 }  // namespace win
 }  // namespace base