Extend scoped_ptr to be closer to unique_ptr. Support custom deleters, and deleting arrays.

media/base/message_loop_factory.h

Index: media/base/message_loop_factory.h
diff --git a/media/base/message_loop_factory.h b/media/base/message_loop_factory.h
index 11cc5bea2038484502c4e0410184f387979c14d2..0ca6608340c88a4f27847da0a76c337a94d3d586 100644
--- a/media/base/message_loop_factory.h
+++ b/media/base/message_loop_factory.h
@@ -39,8 +39,9 @@ class MEDIA_EXPORT MessageLoopFactory {
   scoped_refptr<base::MessageLoopProxy> GetMessageLoop(Type type);
 
  private:
-  // Only allow scoped_ptr<> to delete factory.
-  friend class scoped_ptr<MessageLoopFactory>;
+  // Restrict who can delete the factory to scoped_ptr<>. scoped_ptr<> uses
+  // base::DefaultDeleter.
+  friend struct base::DefaultDeleter<MessageLoopFactory>;
   ~MessageLoopFactory();
 
   // Returns the thread associated with |type| creating a new thread if needed.