[Merge] Pepper: Access PepperMediaDeviceManager through a WeakPtr

content/renderer/pepper/pepper_device_enumeration_host_helper.h

 // 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.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
 #include "ppapi/c/dev/ppb_device_ref_dev.h"
 #include "ppapi/host/host_message_context.h"
 #include "url/gurl.h"
 
 namespace ppapi {
 struct DeviceRefData;
 
 namespace host {
 class ResourceHost;
@@ skipping 28 matching lines @@
     virtual int EnumerateDevices(PP_DeviceType_Dev type,
                                  const GURL& document_url,
                                  const EnumerateDevicesCallback& callback) = 0;
     // Stop enumerating devices of the specified |request_id|. The |request_id|
     // is the return value of EnumerateDevicesCallback.
     virtual void StopEnumerateDevices(int request_id) = 0;
   };
 
   // |resource_host| and |delegate| must outlive this object.
   PepperDeviceEnumerationHostHelper(ppapi::host::ResourceHost* resource_host,
-                                    Delegate* delegate,
+                                    base::WeakPtr<Delegate> delegate,
                                     PP_DeviceType_Dev device_type,
                                     const GURL& document_url);
   ~PepperDeviceEnumerationHostHelper();
 
   // Returns true if the message has been handled.
   bool HandleResourceMessage(const IPC::Message& msg,
                              ppapi::host::HostMessageContext* context,
                              int32_t* result);
 
  private:
@@ skipping 14 matching lines @@
 
   void OnEnumerateDevicesComplete(
       int request_id,
       const std::vector<ppapi::DeviceRefData>& devices);
   void OnNotifyDeviceChange(uint32_t callback_id,
                             int request_id,
                             const std::vector<ppapi::DeviceRefData>& devices);
 
   // Non-owning pointers.
   ppapi::host::ResourceHost* resource_host_;
-  Delegate* delegate_;
+  base::WeakPtr<Delegate> delegate_;
 
   PP_DeviceType_Dev device_type_;
   GURL document_url_;
 
   scoped_ptr<ScopedRequest> enumerate_;
   scoped_ptr<ScopedRequest> monitor_;
 
   ppapi::host::ReplyMessageContext enumerate_devices_context_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperDeviceEnumerationHostHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_