Change assert() to DCHECK() in scoped_ptr.h

base/memory/scoped_ptr_unittest.cc

Index: base/memory/scoped_ptr_unittest.cc
diff --git a/base/memory/scoped_ptr_unittest.cc b/base/memory/scoped_ptr_unittest.cc
index 766f4444001e828cd077ca39b85c7dd326779c65..97f49f0cafe67b826e18598a50818eff01323718 100644
--- a/base/memory/scoped_ptr_unittest.cc
+++ b/base/memory/scoped_ptr_unittest.cc
@@ -641,8 +641,7 @@ TEST(ScopedPtrTest, Conversion) {
   super2 = SubClassReturn();
 }
 
-// Android death tests don't work properly with assert(). Yay.
-#if !defined(NDEBUG) && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
+#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST)
 TEST(ScopedPtrTest, SelfResetAbortsWithDefaultDeleter) {
   scoped_ptr<int> x(new int);
   EXPECT_DEATH(x.reset(x.get()), "");
@@ -671,7 +670,7 @@ TEST(ScopedPtrTest, SelfResetAbortsWithCustomDeleter) {
 TEST(ScopedPtrTest, SelfResetWithCustomDeleterOptOut) {
   // A custom deleter should be able to opt out of self-reset abort behavior.
   struct NoOpDeleter {
-#if !defined(NDEBUG)
+#if DCHECK_IS_ON()
     typedef void AllowSelfReset;
 #endif
     inline void operator()(int*) {}