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

base/memory/scoped_ptr_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 
 #include <sstream>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 623 matching lines @@
 
   // Upcast with Pass() works.
   scoped_ptr<Super> super1 = sub1.Pass();
   super1 = sub2.Pass();
 
   // Upcast with an rvalue works.
   scoped_ptr<Super> super2 = SubClassReturn();
   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()), "");
 }
 
 TEST(ScopedPtrTest, SelfResetAbortsWithDefaultArrayDeleter) {
   scoped_ptr<int[]> y(new int[4]);
   EXPECT_DEATH(y.reset(y.get()), "");
 }
 
 TEST(ScopedPtrTest, SelfResetAbortsWithDefaultFreeDeleter) {
   scoped_ptr<int, base::FreeDeleter> z(static_cast<int*>(malloc(sizeof(int))));
   EXPECT_DEATH(z.reset(z.get()), "");
 }
 
 // A custom deleter that doesn't opt out should still crash.
 TEST(ScopedPtrTest, SelfResetAbortsWithCustomDeleter) {
   struct CustomDeleter {
     inline void operator()(int* x) { delete x; }
   };
   scoped_ptr<int, CustomDeleter> x(new int);
   EXPECT_DEATH(x.reset(x.get()), "");
 }
 #endif
 
 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*) {}
   };
   scoped_ptr<int> owner(new int);
   scoped_ptr<int, NoOpDeleter> x(owner.get());
   x.reset(x.get());
 }
 
 // Logging a scoped_ptr<T> to an ostream shouldn't convert it to a boolean
 // value first.
 TEST(ScopedPtrTest, LoggingDoesntConvertToBoolean) {
   scoped_ptr<int> x(new int);
   std::stringstream s1;
   s1 << x;
 
   std::stringstream s2;
   s2 << x.get();
 
   EXPECT_EQ(s2.str(), s1.str());
 }