Remove FrameViewBase as base class of RemoteFrameView.

third_party/WebKit/Source/core/html/HTMLPlugInElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 33 matching lines @@
 class CORE_EXPORT HTMLPlugInElement : public HTMLFrameOwnerElement {
  public:
   ~HTMLPlugInElement() override;
   DECLARE_VIRTUAL_TRACE();
 
   void SetFocused(bool, WebFocusType) override;
   void ResetInstance();
   // TODO(dcheng): Consider removing this, since HTMLEmbedElementLegacyCall
   // and HTMLObjectElementLegacyCall usage is extremely low.
   SharedPersistent<v8::Object>* PluginWrapper();
-  // TODO(joelhockey): Clean up pluginWidget and plugin (maybe also
-  // pluginWrapper).  It would be good to remove and/or rename some of these.
-  // pluginWidget and plugin both return the plugin that is stored on this
-  // element.  However pluginWidget will synchronously create the plugin if
-  // required by calling layoutPartForJSBindings.  Possibly the pluginWidget
-  // code can be inlined into pluginWrapper.
+  // TODO(joelhockey): Clean up PluginWidget and OwnedPlugin (maybe also
+  // PluginWrapper).  It would be good to remove and/or rename some of these.
+  // PluginWidget and OwnedPlugin both return the plugin that is stored as
+  // widget in HTMLFrameOwnerElement.  However PluginWidget will synchronously
+  // create the plugin if required by calling LayoutPartForJSBindings.
+  // Possibly the PluginWidget code can be inlined into PluginWrapper.
   PluginView* PluginWidget() const;
-  PluginView* Plugin() const;
+  PluginView* OwnedPlugin() const;
   bool CanProcessDrag() const;
   const String& Url() const { return url_; }
 
   // Public for FrameView::addPartToUpdate()
   bool NeedsPluginUpdate() const { return needs_plugin_update_; }
   void SetNeedsPluginUpdate(bool needs_plugin_update) {
     needs_plugin_update_ = needs_plugin_update;
   }
   void UpdatePlugin();
 
@@ skipping 86 matching lines @@
                   const Vector<String>& param_values,
                   bool use_fallback,
                   bool require_layout_object);
   // Perform checks after we have determined that a plugin will be used to
   // show the object (i.e after allowedToLoadObject).
   bool AllowedToLoadPlugin(const KURL&, const String& mime_type);
   // Perform checks based on the URL and MIME-type of the object to load.
   bool AllowedToLoadObject(const KURL&, const String& mime_type);
   bool WouldLoadAsNetscapePlugin(const String& url, const String& service_type);
 
-  void SetPlugin(PluginView*);
-  PluginView* ReleasePlugin();

[joelhockey, 2017/05/01 23:04:35]

These specialized PluginView methods are no longer needed.  PluginView has gone
back to being stored in HTMLFrameOwnerElement::widget_

   void SetPersistedPlugin(PluginView*);
 
   bool RequestObjectInternal(const String& url,
                              const String& mime_type,
                              const Vector<String>& param_names,
                              const Vector<String>& param_values);
 
   mutable RefPtr<SharedPersistent<v8::Object>> plugin_wrapper_;
   bool needs_plugin_update_;
   bool should_prefer_plug_ins_for_images_;
   // Represents |layoutObject() && layoutObject()->isEmbeddedObject() &&
   // !layoutEmbeddedItem().showsUnavailablePluginIndicator()|.  We want to
   // avoid accessing |layoutObject()| in layoutObjectIsFocusable().
   bool plugin_is_available_ = false;
 
-  Member<PluginView> plugin_;
-  // Normally the plugin is stored in HTMLFrameOwnerElement::m_widget.
+  // Normally the plugin is stored in HTMLFrameOwnerElement::widget_.
   // However, plugins can persist even when not rendered. In order to
-  // prevent confusing code which may assume that ownedWidget() != null
-  // means the frame is active, we save off m_widget here while
+  // prevent confusing code which may assume that OwnedWidget() != null
+  // means the frame is active, we save off widget_ here while
   // the plugin is persisting but not being displayed.
   Member<PluginView> persisted_plugin_;
 };
 
 inline bool IsHTMLPlugInElement(const HTMLElement& element) {
   return element.IsPluginElement();
 }
 
 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLPlugInElement);
 
 }  // namespace blink
 
 #endif  // HTMLPlugInElement_h