Remove ScopedComPtr::QueryFrom()

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>
 #include <stddef.h>
 #include <urlhist.h>
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
@@ skipping 272 matching lines @@
 // 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)))
     return false;
 
   base::win::ScopedComPtr<IPersistFile> persist_file;
-  if (FAILED(persist_file.QueryFrom(url_locator.Get())))
+  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;
 
   std::swap(url_locator, *shortcut);
   return true;
 }
 
 // Reads the URL stored in the internet shortcut.
 GURL ReadURLFromInternetShortcut(IUniformResourceLocator* url_locator) {
   base::win::ScopedCoMem<wchar_t> url;
   // GetURL can return S_FALSE (FAILED(S_FALSE) is false) when url == NULL.
   return (FAILED(url_locator->GetURL(&url)) || !url) ?
       GURL() : GURL(url.get());
 }
 
 // Reads the URL of the favicon of the internet shortcut.
 GURL ReadFaviconURLFromInternetShortcut(IUniformResourceLocator* url_locator) {
   base::win::ScopedComPtr<IPropertySetStorage> property_set_storage;
-  if (FAILED(property_set_storage.QueryFrom(url_locator)))
+  if (FAILED(url_locator->QueryInterface(IID_PPV_ARGS(&property_set_storage))))
     return GURL();
 
   base::win::ScopedComPtr<IPropertyStorage> property_storage;
   if (FAILED(property_set_storage->Open(FMTID_Intshcut, STGM_READ,
                                         property_storage.GetAddressOf()))) {
     return GURL();
   }
 
   PROPSPEC properties[] = {{PRSPEC_PROPID, {PID_IS_ICONFILE}}};
   // ReadMultiple takes a non-const array of PROPVARIANTs, but since this code
@@ skipping 579 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;
 }