Upstream misc changes for android.

base/shared_memory_android.cc

 // Copyright (c) 2011 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/shared_memory.h"
 
 #include <sys/mman.h>
 
 #include "base/logging.h"
 #include "third_party/ashmem/ashmem.h"
@@ skipping 21 matching lines @@
   if (err < 0) {
     DLOG(ERROR) << "Error " << err << " when setting protection of ashmem";
     return false;
   }
   created_size_ = size;
 
   return true;
 }
 
 bool SharedMemory::Delete(const std::string& name) {
-  // ashmem doesn't support name mapping
-  NOTIMPLEMENTED();
-  return false;
+  // Like on Windows, this is intentionally returning true as ashmem will
+  // automatically releases the resource when all FDs on it are closed.
+  return true;
 }
 
 bool SharedMemory::Open(const std::string& name, bool read_only) {
   // ashmem doesn't support name mapping
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace base