Remove Pass() on Android.

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 <stddef.h>
 
 #include <sstream>
 
@@ skipping 384 matching lines @@
 
     // Test moving with assignment;
     scoped_ptr<ConDecLogger> scoper3;
     scoper3 = std::move(scoper2);
     EXPECT_EQ(1, constructed);
     EXPECT_FALSE(scoper.get());
     EXPECT_FALSE(scoper2.get());
     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 converted over (that's the next
big batch that I'm working on right now)

   // 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().
   {
     ConDecLogger* logger = new ConDecLogger(&constructed);
     scoped_ptr<ConDecLogger> scoper(logger);
     EXPECT_EQ(1, constructed);
 
     // Should auto-destruct logger by end of scope.
     scoped_ptr<ConDecLogger>&& rvalue = scoper.Pass();
@@ skipping 417 matching lines @@
   EXPECT_FALSE(p < nullptr);
   EXPECT_TRUE(nullptr < p);
   EXPECT_FALSE(pnull < nullptr);
   EXPECT_FALSE(nullptr < pnull);
 
   EXPECT_FALSE(p <= nullptr);
   EXPECT_TRUE(nullptr <= p);
   EXPECT_TRUE(pnull <= nullptr);
   EXPECT_TRUE(nullptr <= pnull);
 }