Revert changes to ie_importer.cc from r25498. The builder doesn't like something; investigating.

TBR=tommi

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25500 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 1a0d86a..21b275a 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/importer/ie_importer.h"
 
+#include <atlbase.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ -16,7 +17,6 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/registry.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/win_util.h"
@@ -142,8 +142,8 @@ void IEImporter::ImportPasswordsIE6() {
     return;
   }
 
-  ScopedComPtr<IPStore, &IID_IPStore> pstore;
-  HRESULT result = PStoreCreateInstance(pstore.Receive(), 0, 0, 0);
+  CComPtr<IPStore, &IID_IPStore> pstore;
+  HRESULT result = PStoreCreateInstance(&pstore, 0, 0, 0);
   if (result != S_OK) {
     FreeLibrary(pstorec_dll);
     return;
@@ -152,9 +152,9 @@ void IEImporter::ImportPasswordsIE6() {
   std::vector<AutoCompleteInfo> ac_list;
 
   // Enumerates AutoComplete items in the protected database.
-  ScopedComPtr<IEnumPStoreItems, &IID_IEnumPStoreItems> item;
+  CComPtr<IEnumPStoreItems> item;
   result = pstore->EnumItems(0, &AutocompleteGUID,
-                             &AutocompleteGUID, 0, item.Receive());
+                             &AutocompleteGUID, 0, &item);
   if (result != PST_E_OK) {
     pstore.Release();
     FreeLibrary(pstorec_dll);
@@ -282,14 +282,14 @@ void IEImporter::ImportHistory() {
                                   chrome::kFileScheme};
   int total_schemes = arraysize(kSchemes);
 
-  ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
+  CComPtr<IUrlHistoryStg2> url_history_stg2;
   HRESULT result;
-  result = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
-                                           CLSCTX_INPROC_SERVER);
+  result = url_history_stg2.CoCreateInstance(CLSID_CUrlHistory, NULL,
+                                             CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return;
-  ScopedComPtr<IEnumSTATURL> enum_url;
-  if (SUCCEEDED(result = url_history_stg2->EnumUrls(enum_url.Receive()))) {
+  CComPtr<IEnumSTATURL> enum_url;
+  if (SUCCEEDED(result = url_history_stg2->EnumUrls(&enum_url))) {
     std::vector<history::URLRow> rows;
     STATURL stat_url;
     ULONG fetched;
@@ -541,14 +541,14 @@ void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info,
 
 std::wstring IEImporter::ResolveInternetShortcut(const std::wstring& file) {
   win_util::CoMemReleaser<wchar_t> url;
-  ScopedComPtr<IUniformResourceLocator> url_locator;
-  HRESULT result = url_locator.CreateInstance(CLSID_InternetShortcut, NULL,
-                                              CLSCTX_INPROC_SERVER);
+  CComPtr<IUniformResourceLocator> url_locator;
+  HRESULT result = url_locator.CoCreateInstance(CLSID_InternetShortcut, NULL,
+                                                CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return std::wstring();
 
-  ScopedComPtr<IPersistFile> persist_file;
-  result = persist_file.QueryFrom(url_locator);
+  CComPtr<IPersistFile> persist_file;
+  result = url_locator.QueryInterface(&persist_file);
   if (FAILED(result))
     return std::wstring();