| Index: chrome/utility/importer/ie_importer_win.cc
|
| diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
|
| index ecf1b1ddf587e065ae5f86dff68339afcc9b00a5..fdb68abc3be85d1fa60b03346411a2dfe6115c36 100644
|
| --- a/chrome/utility/importer/ie_importer_win.cc
|
| +++ b/chrome/utility/importer/ie_importer_win.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/utility/importer/ie_importer_win.h"
|
|
|
| +#include <objbase.h>
|
| #include <ole2.h>
|
| #include <intshcut.h>
|
| #include <shlobj.h>
|
| @@ -296,7 +297,7 @@ bool LoadInternetShortcut(
|
| 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.
|
| @@ -318,7 +319,7 @@ GURL ReadURLFromInternetShortcut(IUniformResourceLocator* url_locator) {
|
| // 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;
|
|
|