Index: base/memory/scoped_ptr_unittest.cc |
diff --git a/base/memory/scoped_ptr_unittest.cc b/base/memory/scoped_ptr_unittest.cc |
index 24d43c53a966feb89bb4ae5f83b9beaeb5e273d7..f0915960f7e64284befab9df1bad313ecd752d2d 100644 |
--- a/base/memory/scoped_ptr_unittest.cc |
+++ b/base/memory/scoped_ptr_unittest.cc |
@@ -402,7 +402,7 @@ TEST(ScopedPtrTest, MoveBehavior) { |
EXPECT_TRUE(scoper3.get()); |
} |
-#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
+#if !(defined(OS_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) |
dcheng
2015/12/30 22:10:47
I'll simplify this conditional once I get CrOS con
|
// Test uncaught Pass() does not have side effects, because Pass() |
// is implemented by std::move(). |
// TODO(danakj): Remove this test case when we remove Pass(). |