Rename ScopedComPtr::Release() to ScopedComPtr::Reset()

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 {
 
 namespace {
 
 struct Dummy {
   Dummy() : adds(0), releases(0) { }
-  void AddRef() { ++adds; }
-  void Release() { ++releases; }
+  unsigned long AddRef() { return ++adds; }
+  unsigned long Release() { return ++releases; }
 
   int adds;
   int releases;
 };
 
 extern const IID dummy_iid;
 const IID dummy_iid = {0x12345678u,
                        0x1234u,
                        0x5678u,
                        {01, 23, 45, 67, 89, 01, 23, 45}};
@@ skipping 10 matching lines @@
   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_PPV_ARGS(&qi_test)));
   EXPECT_TRUE(qi_test.get() != NULL);
-  qi_test.Release();
+  qi_test.Reset();
 
   // 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();
   copy1 = naked_copy;  // Test the =(T*) operator.
   naked_copy->Release();
 
-  copy1.Release();
+  copy1.Reset();
   EXPECT_FALSE(copy1.IsSameObject(unk2.get()));  // unk2 is valid, copy1 is not
 
   // test Interface* constructor
   ScopedComPtr<IMalloc> copy2(static_cast<IMalloc*>(mem_alloc.get()));
   EXPECT_TRUE(copy2.IsSameObject(mem_alloc.get()));
 
   EXPECT_TRUE(SUCCEEDED(unk.QueryFrom(mem_alloc.get())));
   EXPECT_TRUE(unk.get() != NULL);
-  unk.Release();
+  unk.Reset();
   EXPECT_TRUE(unk.get() == NULL);
   EXPECT_TRUE(unk.IsSameObject(copy1.get()));  // both are NULL
 }
 
 TEST(ScopedComPtrTest, ScopedComPtrVector) {
   // Verify we don't get error C2558.
   typedef ScopedComPtr<Dummy, &dummy_iid> Ptr;
   std::vector<Ptr> bleh;
 
   std::unique_ptr<Dummy> p(new Dummy);
@@ skipping 16 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