Remove Pass() on Android.
Pass() is a legacy of the original C++03 move emulation implementation.
New code should use std::move from <utility>.
❆(੭ु ◜◡‾)੭ु⁾☃❆
BUG=557422
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1559603002
Cr-Commit-Position: refs/heads/master@{#367251}
CrOS-Libchrome-Original-Commit: 92469c8c4b7da052273dee1a31308663d1dd1e3d
diff --git a/base/memory/scoped_ptr_unittest.cc b/base/memory/scoped_ptr_unittest.cc
index 24d43c5..f091596 100644
--- a/base/memory/scoped_ptr_unittest.cc
+++ b/base/memory/scoped_ptr_unittest.cc
@@ -402,7 +402,7 @@
EXPECT_TRUE(scoper3.get());
}
-#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if !(defined(OS_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)))
// 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().
diff --git a/base/move.h b/base/move.h
index 482ee81..66d8521 100644
--- a/base/move.h
+++ b/base/move.h
@@ -31,7 +31,7 @@
// for more details.
// TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN
// everywhere instead.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
#define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \
private: \
type(const type&) = delete; \