Index: base/win/scoped_comptr_unittest.cc |
diff --git a/base/win/scoped_comptr_unittest.cc b/base/win/scoped_comptr_unittest.cc |
index 3cde3145217cbabef13a752c05e44e70baeb932a..b5f5f367f6398751198fefa5a5289e954ef7cd3b 100644 |
--- a/base/win/scoped_comptr_unittest.cc |
+++ b/base/win/scoped_comptr_unittest.cc |
@@ -42,39 +42,39 @@ TEST(ScopedComPtrTest, ScopedComPtr) { |
EXPECT_TRUE(SUCCEEDED(unk.CreateInstance(CLSID_ShellLink))); |
ScopedComPtr<IUnknown> unk2; |
unk2.Attach(unk.Detach()); |
- EXPECT_TRUE(unk.get() == NULL); |
- EXPECT_TRUE(unk2.get() != NULL); |
+ 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); |
+ EXPECT_TRUE(qi_test.Get() != NULL); |
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 |
+ 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.Reset(); |
- EXPECT_FALSE(copy1.IsSameObject(unk2.get())); // unk2 is valid, copy1 is not |
+ 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())); |
+ 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); |
+ EXPECT_TRUE(SUCCEEDED(unk.QueryFrom(mem_alloc.Get()))); |
+ EXPECT_TRUE(unk.Get() != NULL); |
unk.Reset(); |
- EXPECT_TRUE(unk.get() == NULL); |
- EXPECT_TRUE(unk.IsSameObject(copy1.get())); // both are NULL |
+ EXPECT_TRUE(unk.Get() == NULL); |
+ EXPECT_TRUE(unk.IsSameObject(copy1.Get())); // both are NULL |
} |
TEST(ScopedComPtrTest, ScopedComPtrVector) { |
@@ -98,7 +98,7 @@ TEST(ScopedComPtrTest, ScopedComPtrVector) { |
bleh.push_back(p2); |
EXPECT_EQ(p->adds, 4); |
EXPECT_EQ(p->releases, 1); |
- EXPECT_EQ(bleh[0].get(), p.get()); |
+ EXPECT_EQ(bleh[0].Get(), p.get()); |
bleh.pop_back(); |
EXPECT_EQ(p->adds, 4); |
EXPECT_EQ(p->releases, 2); |