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

Unified Diff: base/mac/scoped_nsobject_unittest.mm

Issue 2522943003: [iOS/ARC] Fix a violation of ODR in base::BindBlock under ARC. (Closed)
Patch Set: Use EXPECT_NSEQ instead of EXPECT_EQ/EXPECT_TRUE. Created 4 years, 1 month 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
« no previous file with comments | « base/mac/bind_objc_block_unittest_arc.mm ('k') | base/mac/scoped_nsobject_unittest_arc.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/mac/scoped_nsobject_unittest.mm
diff --git a/base/mac/scoped_nsobject_unittest.mm b/base/mac/scoped_nsobject_unittest.mm
index 457962d94189b40bb4345aa66dfc82580ed6c789..72d524225829573f7bd50b81476d0be394293174 100644
--- a/base/mac/scoped_nsobject_unittest.mm
+++ b/base/mac/scoped_nsobject_unittest.mm
@@ -8,16 +8,8 @@
#include "base/mac/scoped_nsobject.h"
#include "testing/gtest/include/gtest/gtest.h"
-// See scoped_nsobject_unittest_arc.mm for why this is necessary. Remove once
-// gyp support is dropped.
-void ScopedNSObjectUnittestArcLinkerWorkaround();
-
namespace {
-TEST(ScopedNSObjectTest, EnableARCTests) {
- ScopedNSObjectUnittestArcLinkerWorkaround();
-}
-
TEST(ScopedNSObjectTest, ScopedNSObject) {
base::scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
ASSERT_TRUE(p1.get());
« no previous file with comments | « base/mac/bind_objc_block_unittest_arc.mm ('k') | base/mac/scoped_nsobject_unittest_arc.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698