Move BrowserPluginDelegate's lifetime mgmt out of content/

content/renderer/browser_plugin/browser_plugin.h

 // Copyright 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_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
 
 #include "third_party/WebKit/public/web/WebPlugin.h"
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 37 matching lines @@
 
   // Informs the guest of an updated focus state.
   void UpdateGuestFocusState(blink::WebFocusType focus_type);
 
   // Indicates whether the guest should be focused.
   bool ShouldGuestBeFocused() const;
 
   // A request to enable hardware compositing.
   void EnableCompositing(bool enable);
 
-  void UpdateInternalInstanceId();
-
   // Provided that a guest instance ID has been allocated, this method attaches
   // this BrowserPlugin instance to that guest.
   void Attach();
 
   // This method detaches this BrowserPlugin instance from the guest that it's
   // currently attached to, if any.
   void Detach();
 
   // Notify the plugin about a compositor commit so that frame ACKs could be
   // sent, if needed.
@@ skipping 69 matching lines @@
   // Only the manager is allowed to create a BrowserPlugin.
   friend class BrowserPluginManager;
 
   // A BrowserPlugin object is a controller that represents an instance of a
   // browser plugin within the embedder renderer process. Once a BrowserPlugin
   // does an initial navigation or is attached to a newly created guest, it
   // acquires a browser_plugin_instance_id as well. The guest instance ID
   // uniquely identifies a guest WebContents that's hosted by this
   // BrowserPlugin.
   BrowserPlugin(RenderFrame* render_frame,
-                scoped_ptr<BrowserPluginDelegate> delegate);
+                BrowserPluginDelegate* delegate);
 
   ~BrowserPlugin() override;
 
   gfx::Rect view_rect() const { return view_rect_; }
 
   void ShowSadGraphic();
+  void UpdateInternalInstanceId();
 
   // IPC message handlers.
   // Please keep in alphabetical order.
   void OnAdvanceFocus(int instance_id, bool reverse);
   void OnCompositorFrameSwapped(const IPC::Message& message);
   void OnGuestGone(int instance_id);
   void OnSetContentsOpaque(int instance_id, bool opaque);
   void OnSetCursor(int instance_id, const WebCursor& cursor);
   void OnSetMouseLock(int instance_id, bool enable);
   void OnSetTooltipText(int browser_plugin_instance_id,
@@ skipping 28 matching lines @@
   scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
 
   // URL for the embedder frame.
   int browser_plugin_instance_id_;
 
   // Indicates whether the guest content is opaque.
   bool contents_opaque_;
 
   std::vector<EditCommand> edit_commands_;
 
-  scoped_ptr<BrowserPluginDelegate> delegate_;
+  // We call lifetime managing methods on |delegate_|, but we do not directly
+  // own this. The delegate destroys itself.
+  BrowserPluginDelegate* delegate_;
 
   // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might
   // get called after BrowserPlugin has been destroyed.
   base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPlugin);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_