| 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 047fb1eb31ccc9778a3980451315939b1f7eb26d..9c5fc303c5502dbd1a9b54e8f26ed425bef475de 100644
|
| --- a/chrome/utility/importer/ie_importer_win.cc
|
| +++ b/chrome/utility/importer/ie_importer_win.cc
|
| @@ -296,7 +296,7 @@ bool LoadInternetShortcut(
|
| return false;
|
|
|
| base::win::ScopedComPtr<IPersistFile> persist_file;
|
| - if (FAILED(persist_file.QueryFrom(url_locator.get())))
|
| + if (FAILED(persist_file.QueryFrom(url_locator.Get())))
|
| return false;
|
|
|
| // Loads the Internet Shortcut from persistent storage.
|
| @@ -856,7 +856,7 @@ void IEImporter::ParseFavoritesFolder(
|
| base::win::ScopedComPtr<IUniformResourceLocator> url_locator;
|
| if (!LoadInternetShortcut(*it, &url_locator))
|
| continue;
|
| - GURL url = ReadURLFromInternetShortcut(url_locator.get());
|
| + GURL url = ReadURLFromInternetShortcut(url_locator.Get());
|
| if (!url.is_valid())
|
| continue;
|
| // Skip default bookmarks. go.microsoft.com redirects to
|
| @@ -867,7 +867,7 @@ void IEImporter::ParseFavoritesFolder(
|
| if (url.host() == "go.microsoft.com")
|
| continue;
|
| // Read favicon.
|
| - UpdateFaviconMap(*it, url, url_locator.get(), &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.
|
|
|