Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Unified Diff: chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc b/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
index 0d9cc37d927650ccd6deaf59e552ed14a2448912..0d424f8f0ea9cfef896178957e474421346e89f9 100644
--- a/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc
@@ -98,15 +98,15 @@ TEST(DedupingFactoryTest, InstantiationParameterized) {
factory.Instantiate(kTypeName, d1.get(), &error, &bad_message));
scoped_refptr<const BaseClass> c2(
factory.Instantiate(kTypeName, d2.get(), &error, &bad_message));
- ASSERT_TRUE(c1);
- ASSERT_TRUE(c2);
+ ASSERT_TRUE(c1.get());
+ ASSERT_TRUE(c2.get());
EXPECT_EQ(1, static_cast<const Foo*>(c1.get())->parameter());
EXPECT_EQ(2, static_cast<const Foo*>(c2.get())->parameter());
// This one produces an overflow, now the cache contains [2, 3]
scoped_refptr<const BaseClass> c3(
factory.Instantiate(kTypeName, d3.get(), &error, &bad_message));
- ASSERT_TRUE(c3);
+ ASSERT_TRUE(c3.get());
EXPECT_EQ(3, static_cast<const Foo*>(c3.get())->parameter());
// Reuse 2, this should give the same instance as c2.
@@ -144,8 +144,8 @@ TEST(DedupingFactoryTest, InstantiationNonParameterized) {
factory.Instantiate(kTypeName, d1.get(), &error, &bad_message));
scoped_refptr<const BaseClass> c2(
factory.Instantiate(kTypeName, d2.get(), &error, &bad_message));
- ASSERT_TRUE(c1);
- ASSERT_TRUE(c2);
+ ASSERT_TRUE(c1.get());
+ ASSERT_TRUE(c2.get());
EXPECT_EQ(1, static_cast<const Foo*>(c1.get())->parameter());
EXPECT_EQ(1, static_cast<const Foo*>(c2.get())->parameter());
EXPECT_EQ(c1, c2);
@@ -168,8 +168,8 @@ TEST(DedupingFactoryTest, TypeNames) {
scoped_refptr<const BaseClass> c1_b(
factory.Instantiate(kTypeName2, d1.get(), &error, &bad_message));
- ASSERT_TRUE(c1_a);
- ASSERT_TRUE(c1_b);
+ ASSERT_TRUE(c1_a.get());
+ ASSERT_TRUE(c1_b.get());
EXPECT_NE(c1_a, c1_b);
}
@@ -191,8 +191,8 @@ TEST(DedupingFactoryTest, Clear) {
scoped_refptr<const BaseClass> c1_b(
factory.Instantiate(kTypeName, d1.get(), &error, &bad_message));
- ASSERT_TRUE(c1_a);
- ASSERT_TRUE(c1_b);
+ ASSERT_TRUE(c1_a.get());
+ ASSERT_TRUE(c1_b.get());
EXPECT_NE(c1_a, c1_b);
}

Powered by Google App Engine
This is Rietveld 408576698