Remove ScopedComPtr::ReceiveVoid and Add ScopedComPtrRef

components/update_client/background_downloader_win.cc

 // Copyright 2014 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 "components/update_client/background_downloader_win.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <objbase.h>
 #include <stddef.h>
@@ skipping 119 matching lines @@
 const int kPurgeStaleJobsAfterDays = 7;
 const int kPurgeStaleJobsIntervalBetweenChecksDays = 1;
 
 // Retrieves the singleton instance of GIT for this process.
 HRESULT GetGit(ScopedComPtr<IGlobalInterfaceTable>* git) {
   return git->CreateInstance(CLSID_StdGlobalInterfaceTable, NULL,
                              CLSCTX_INPROC_SERVER);
 }
 
 // Retrieves an interface pointer from the process GIT for a given |cookie|.
-template <typename T>
-HRESULT GetInterfaceFromGit(const ScopedComPtr<IGlobalInterfaceTable>& git,
+HRESULT GetInterfaceFromGit(IGlobalInterfaceTable* git,
                             DWORD cookie,
-                            ScopedComPtr<T>* p) {
-  return git->GetInterfaceFromGlobal(cookie, IID_PPV_ARGS(p));
+                            REFIID riid,
+                            void** ppv) {
+  return git->GetInterfaceFromGlobal(cookie, riid, ppv);
 }
 
 // Registers an interface pointer in GIT and returns its corresponding |cookie|.
 template <typename T>
 HRESULT RegisterInterfaceInGit(const ScopedComPtr<IGlobalInterfaceTable>& git,
                                const ScopedComPtr<T>& p,
                                DWORD* cookie) {
   return git->RegisterInterfaceInGlobal(p.Get(), __uuidof(T), cookie);
 }
 
@@ skipping 681 matching lines @@
 
 HRESULT BackgroundDownloader::UpdateInterfacePointers() {
   DCHECK(task_runner()->RunsTasksOnCurrentThread());
 
   ScopedComPtr<IGlobalInterfaceTable> git;
   HRESULT hr = GetGit(&git);
   if (FAILED(hr))
     return hr;
 
   bits_manager_ = nullptr;
-  hr = GetInterfaceFromGit(git, git_cookie_bits_manager_, &bits_manager_);
+  hr = GetInterfaceFromGit(git.Get(), git_cookie_bits_manager_,
+                           IID_PPV_ARGS(&bits_manager_));
   if (FAILED(hr))
     return hr;
 
   job_ = nullptr;
-  hr = GetInterfaceFromGit(git, git_cookie_job_, &job_);
+  hr = GetInterfaceFromGit(git.Get(), git_cookie_job_, IID_PPV_ARGS(&job_));
   if (FAILED(hr))
     return hr;
 
   return S_OK;
 }
 
 void BackgroundDownloader::ResetInterfacePointers() {
   job_ = nullptr;
   bits_manager_ = nullptr;
 }
@@ skipping 14 matching lines @@
 
   for (auto cookie : cookies) {
     // TODO(sorin): check the result of the call, see crbug.com/644857.
     git->RevokeInterfaceFromGlobal(cookie);
   }
 
   return S_OK;
 }
 
 }  // namespace update_client