| Index: base/win/scoped_comptr.h
|
| diff --git a/base/win/scoped_comptr.h b/base/win/scoped_comptr.h
|
| index 598f90953afa986ee16b3e4b917e994fa8d40698..527efeead14c298feee56438bb19b739b9d0912e 100644
|
| --- a/base/win/scoped_comptr.h
|
| +++ b/base/win/scoped_comptr.h
|
| @@ -100,7 +100,7 @@ class ScopedComPtr {
|
| }
|
|
|
| template <class Query>
|
| - HRESULT QueryInterface(Query** p) {
|
| + HRESULT CopyTo(Query** p) {
|
| DCHECK(p);
|
| DCHECK(ptr_);
|
| // IUnknown already has a template version of QueryInterface
|
| @@ -110,7 +110,7 @@ class ScopedComPtr {
|
| }
|
|
|
| // QI for times when the IID is not associated with the type.
|
| - HRESULT QueryInterface(const IID& iid, void** obj) {
|
| + HRESULT CopyTo(const IID& iid, void** obj) {
|
| DCHECK(obj);
|
| DCHECK(ptr_);
|
| return ptr_->QueryInterface(iid, obj);
|
| @@ -142,7 +142,7 @@ class ScopedComPtr {
|
| return false;
|
|
|
| ScopedComPtr<IUnknown> my_identity;
|
| - QueryInterface(IID_PPV_ARGS(my_identity.Receive()));
|
| + CopyTo(IID_PPV_ARGS(my_identity.Receive()));
|
|
|
| ScopedComPtr<IUnknown> other_identity;
|
| other->QueryInterface(IID_PPV_ARGS(other_identity.Receive()));
|
|
|