Add IID_PPV_ARGS_Helper for ScopedComPtr

base/win/scoped_comptr_unittest.cc

 // Copyright (c) 2011 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 "base/win/scoped_comptr.h"
 
+#include <objbase.h>
 #include <shlobj.h>
 
 #include <memory>
 
 #include "base/win/scoped_com_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace win {
 
@@ skipping 27 matching lines @@
   EXPECT_TRUE(SUCCEEDED(unk.CreateInstance(CLSID_ShellLink)));
   ScopedComPtr<IUnknown> unk2;
   unk2.Attach(unk.Detach());
   EXPECT_TRUE(unk.get() == NULL);
   EXPECT_TRUE(unk2.get() != NULL);
 
   ScopedComPtr<IMalloc> mem_alloc;
   EXPECT_TRUE(SUCCEEDED(CoGetMalloc(1, mem_alloc.Receive())));
 
   ScopedComPtr<IUnknown> qi_test;
-  EXPECT_HRESULT_SUCCEEDED(mem_alloc.QueryInterface(IID_IUnknown,
-      reinterpret_cast<void**>(qi_test.Receive())));
+  EXPECT_HRESULT_SUCCEEDED(mem_alloc.QueryInterface(IID_PPV_ARGS(&qi_test)));
   EXPECT_TRUE(qi_test.get() != NULL);
   qi_test.Release();
 
   // test ScopedComPtr& constructor
   ScopedComPtr<IMalloc> copy1(mem_alloc);
   EXPECT_TRUE(copy1.IsSameObject(mem_alloc.get()));
   EXPECT_FALSE(copy1.IsSameObject(unk2.get()));  // unk2 is valid but different
   EXPECT_FALSE(copy1.IsSameObject(unk.get()));  // unk is NULL
 
   IMalloc* naked_copy = copy1.Detach();
@@ skipping 39 matching lines @@
     bleh.pop_back();
     EXPECT_EQ(p->adds, 4);
     EXPECT_EQ(p->releases, 2);
   }
   EXPECT_EQ(p->adds, 4);
   EXPECT_EQ(p->releases, 4);
 }
 
 }  // namespace win
 }  // namespace base