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

Unified Diff: base/memory/scoped_ptr_unittest.cc

Issue 1559603002: Remove Pass() on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | base/move.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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().
« no previous file with comments | « no previous file | base/move.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698