Move BrowserPluginDelegate's lifetime mgmt out of content/

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f67a40a2a53ed746c35dccead80b3d1f505057bb..e47fa4f639374fe8cc8ac565d603a9ff55a8a184 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1791,11 +1791,10 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
   DCHECK_EQ(frame_, frame);
 #if defined(ENABLE_PLUGINS)
   if (info.type == WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN) {
-    scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate(
+    return BrowserPluginManager::Get()->CreateBrowserPlugin(
+        this,
         GetContentClient()->renderer()->CreateBrowserPluginDelegate(
             this, params.mimeType.utf8(), GURL(params.url)));
-    return BrowserPluginManager::Get()->CreateBrowserPlugin(
-        this, browser_plugin_delegate.Pass());
   }
 
   bool pepper_plugin_was_registered = false;
@@ -1911,11 +1910,10 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
   }
 
   if (base::UTF16ToUTF8(params.mimeType) == kBrowserPluginMimeType) {
-    scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate(
+    return BrowserPluginManager::Get()->CreateBrowserPlugin(
+        this,
         GetContentClient()->renderer()->CreateBrowserPluginDelegate(this,
             kBrowserPluginMimeType, GURL(params.url)));
-    return BrowserPluginManager::Get()->CreateBrowserPlugin(
-        this, browser_plugin_delegate.Pass());
   }
 
 #if defined(ENABLE_PLUGINS)