Rename ChromeBrowserPluginDelegate to GuestViewContainer

content/renderer/render_frame_impl.cc

 // Copyright 2013 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.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 1534 matching lines @@
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params) {
   DCHECK_EQ(frame_, frame);
   blink::WebPlugin* plugin = NULL;
   if (GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
     return plugin;
   }
 
   if (base::UTF16ToUTF8(params.mimeType) == kBrowserPluginMimeType) {
+    scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate(
+        GetContentClient()->renderer()->CreateBrowserPluginDelegate(
+            this, base::UTF16ToUTF8(params.mimeType)));

[Charlie Reis, 2014/09/15 23:04:11]

Can you just pass kBrowserPluginMimeType here, rather than repeating the
conversion?  We've just tested that they're equal.

[Fady Samuel, 2014/09/16 00:33:00]

Wow, this is actually a bug. The mime type supposed to be the mime type of the
content we're loading. In this case, the content we're loading is just general
webcontent and so the mime type is supposed to be the empty string. FIXED!
Thanks!

     return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin(
-        render_view_.get(), frame, scoped_ptr<BrowserPluginDelegate>());
+        render_view_.get(), frame, browser_plugin_delegate.Pass());
   }
 
 #if defined(ENABLE_PLUGINS)
   WebPluginInfo info;
   std::string mime_type;
   bool found = false;
   Send(new FrameHostMsg_GetPluginInfo(
       routing_id_, params.url, frame->top()->document().url(),
       params.mimeType.utf8(), &found, &info, &mime_type));
   if (!found)
@@ skipping 2337 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content