commit 3a61e7f37785492a286a694c544de2a964907c0b
author Ehsan Karamad <ekaramad@chromium.org> Sat May 25 00:28:08 2019
committer Commit Bot <commit-bot@chromium.org> Sat May 25 00:28:08 2019
tree c84a078d786ac24df6e4d7532af7136e668ce26e
parent 369ead92b311713cb066d2248a22ff58e1d90d19

[ MimeHandlerView ] Cleanup some unnecessary code

CreateFrameContainer contains some old code form when the method was
static. This CL cleans that up.

TBR=wjmaclean@chromium.org

Bug: 659750
Change-Id: I186176c9e60ac65663f6a3274de5aa45e114adfe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1629328
Reviewed-by: Ehsan Karamad <ekaramad@chromium.org>
Commit-Queue: Ehsan Karamad <ekaramad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663343}

extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc

diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc
index b1b8a37..439870d 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc
@@ -83,11 +83,7 @@
     // (which used to create a MimeHandlerViewContainer).
     return false;
   }
-  // If there is already a MHVFC for this |plugin_element|, destroy it.
-  auto* manager = Get(content::RenderFrame::FromWebFrame(
-                          plugin_element.GetDocument().GetFrame()),
-                      true /* create_if_does_not_exist */);
-  if (manager->IsManagedByContainerManager(plugin_element)) {
+  if (IsManagedByContainerManager(plugin_element)) {
     // This is the one injected by HTML string. Return true so that the
     // HTMLPlugInElement creates a child frame to be used as the outer
     // WebContents frame.
@@ -102,13 +98,14 @@
       // This should translate into a same document navigation.
       return true;
     }
-    manager->RemoveFrameContainerForReason(
-        old_frame_container, UMAType::kRemoveFrameContainerUpdatePlugin);
+    // If there is already a MHVFC for this |plugin_element|, destroy it.
+    RemoveFrameContainerForReason(old_frame_container,
+                                  UMAType::kRemoveFrameContainerUpdatePlugin);
   }
   RecordInteraction(UMAType::kCreateFrameContainer);
   auto frame_container = std::make_unique<MimeHandlerViewFrameContainer>(
       this, plugin_element, resource_url, mime_type);
-  manager->frame_containers_.push_back(std::move(frame_container));
+  frame_containers_.push_back(std::move(frame_container));
   return true;
 }