content: Remove non-thread-safe use of WeakPtrs.

content/child/child_discardable_shared_memory_manager.cc

Index: content/child/child_discardable_shared_memory_manager.cc
diff --git a/content/child/child_discardable_shared_memory_manager.cc b/content/child/child_discardable_shared_memory_manager.cc
index 14dfe97e7df975420594e4de8ed44e358451f88d..863e3fc0808870f38cc021f6222e0f74c2364d16 100644
--- a/content/child/child_discardable_shared_memory_manager.cc
+++ b/content/child/child_discardable_shared_memory_manager.cc
@@ -71,17 +71,18 @@ class DiscardableMemoryImpl : public base::DiscardableMemory {
   DISALLOW_COPY_AND_ASSIGN(DiscardableMemoryImpl);
 };
 
+void DeletedDiscardableSharedMemory(

[Avi (use Gerrit), 2015/03/27 21:13:01]

We name functions based on what they do, not when they are called.

For example:
- AllocateLockedDiscardableMemory
- LockSpan
- ReleaseFreeMemory

Name this after what it does.

[reveman, 2015/03/27 21:27:34]

Hm, this is supposed to handle the notification that DiscardableSharedMemory
instance was deleted. The current name matches the IPC and the IPC name matches
a number of similar IPCs. We could call it something like
NotifyHostThatDiscardableSharedMemoryWasDeleted here but I think I prefer to
keep this as it is. I don't feel that strongly about though and will change to
NotifyHost... if you prefer that?

[Avi (use Gerrit), 2015/03/27 21:38:46]

Something like SendMemoryDeletedMessage?. I'm looking for a verb to be the first
word.

[reveman, 2015/03/27 21:53:52]

SendDeletedDiscardableSharedMemoryMessage where "DeletedDiscardableSharedMemory"
is the name of the IPC message.

+    scoped_refptr<ThreadSafeSender> sender, DiscardableSharedMemoryId id) {
+  sender->Send(new ChildProcessHostMsg_DeletedDiscardableSharedMemory(id));
+}
+
 }  // namespace
 
 ChildDiscardableSharedMemoryManager::ChildDiscardableSharedMemoryManager(
-    ThreadSafeSender* sender)
-    : heap_(base::GetPageSize()), sender_(sender), weak_ptr_factory_(this) {
+    ThreadSafeSender* sender) : heap_(base::GetPageSize()), sender_(sender) {
 }
 
 ChildDiscardableSharedMemoryManager::~ChildDiscardableSharedMemoryManager() {
-  // Cancel all DeletedDiscardableSharedMemory callbacks.
-  weak_ptr_factory_.InvalidateWeakPtrs();
-
   // TODO(reveman): Determine if this DCHECK can be enabled. crbug.com/430533
   // DCHECK_EQ(heap_.GetSize(), heap_.GetSizeOfFreeLists());
   if (heap_.GetSize())
@@ -167,9 +168,7 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory(
   // Create span for allocated memory.
   scoped_ptr<DiscardableSharedMemoryHeap::Span> new_span(heap_.Grow(
       shared_memory.Pass(), allocation_size_in_bytes,
-      base::Bind(
-          &ChildDiscardableSharedMemoryManager::DeletedDiscardableSharedMemory,
-          weak_ptr_factory_.GetWeakPtr(), new_id)));
+      base::Bind(&DeletedDiscardableSharedMemory, sender_, new_id)));
 
   // Unlock and insert any left over memory into free lists.
   if (pages < pages_to_allocate) {
@@ -271,11 +270,6 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
   return memory.Pass();
 }
 
-void ChildDiscardableSharedMemoryManager::DeletedDiscardableSharedMemory(
-    DiscardableSharedMemoryId id) {
-  sender_->Send(new ChildProcessHostMsg_DeletedDiscardableSharedMemory(id));
-}
-
 void ChildDiscardableSharedMemoryManager::MemoryUsageChanged(
     size_t new_bytes_total,
     size_t new_bytes_free) const {