Remove Interface ID Template Parameter from ScopedComPtr

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>
@@ skipping 572 matching lines @@
   HMODULE pstorec_dll = LoadLibrary(L"pstorec.dll");
   if (!pstorec_dll)
     return;
   PStoreCreateFunc PStoreCreateInstance =
       (PStoreCreateFunc)GetProcAddress(pstorec_dll, "PStoreCreateInstance");
   if (!PStoreCreateInstance) {
     FreeLibrary(pstorec_dll);
     return;
   }
 
-  base::win::ScopedComPtr<IPStore, &IID_IPStore> pstore;
+  base::win::ScopedComPtr<IPStore> pstore;
   HRESULT result = PStoreCreateInstance(pstore.GetAddressOf(), 0, 0, 0);
   if (result != S_OK) {
     FreeLibrary(pstorec_dll);
     return;
   }
 
   std::vector<AutoCompleteInfo> ac_list;
 
   // Enumerates AutoComplete items in the protected database.
-  base::win::ScopedComPtr<IEnumPStoreItems, &IID_IEnumPStoreItems> item;
+  base::win::ScopedComPtr<IEnumPStoreItems> item;
   result = pstore->EnumItems(0, &AutocompleteGUID, &AutocompleteGUID, 0,
                              item.GetAddressOf());
   if (result != PST_E_OK) {
     pstore.Reset();
     FreeLibrary(pstorec_dll);
     return;
   }
 
   wchar_t* item_name;
   while (!cancelled() && SUCCEEDED(item->Next(1, &item_name, 0))) {
@@ skipping 299 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;
 }