| 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 d79ce612d613dfe71c49e3a60f2560811b12ce34..aaa9327f74eff9053e10e58511210feb630a5f79 100644
|
| --- a/chrome/utility/importer/ie_importer_win.cc
|
| +++ b/chrome/utility/importer/ie_importer_win.cc
|
| @@ -276,7 +276,7 @@ bool LoadInternetShortcut(
|
| return false;
|
|
|
| base::win::ScopedComPtr<IPersistFile> persist_file;
|
| - if (FAILED(persist_file.QueryFrom(url_locator)))
|
| + if (FAILED(persist_file.QueryFrom(url_locator.get())))
|
| return false;
|
|
|
| // Loads the Internet Shortcut from persistent storage.
|
| @@ -821,7 +821,7 @@ void IEImporter::ParseFavoritesFolder(
|
| base::win::ScopedComPtr<IUniformResourceLocator> url_locator;
|
| if (!LoadInternetShortcut(*it, &url_locator))
|
| continue;
|
| - GURL url = ReadURLFromInternetShortcut(url_locator);
|
| + GURL url = ReadURLFromInternetShortcut(url_locator.get());
|
| if (!url.is_valid())
|
| continue;
|
| // Skip default bookmarks. go.microsoft.com redirects to
|
| @@ -832,7 +832,7 @@ void IEImporter::ParseFavoritesFolder(
|
| if (url.host() == "go.microsoft.com")
|
| continue;
|
| // Read favicon.
|
| - UpdateFaviconMap(*it, url, url_locator, &favicon_map);
|
| + UpdateFaviconMap(*it, url, url_locator.get(), &favicon_map);
|
|
|
| // Make the relative path from the Favorites folder, without the basename.
|
| // ex. Suppose that the Favorites folder is C:\Users\Foo\Favorites.
|
|
|