Move WebFrame to use WebLocalFrameBase instead of WebLocalFrameImpl.

third_party/WebKit/Source/web/WebLocalFrameImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 66 matching lines @@
 enum class WebFrameLoadType;
 struct FrameLoadRequest;
 struct WebContentSecurityPolicyViolation;
 struct WebPrintParams;
 
 template <typename T>
 class WebVector;
 
 // Implementation of WebFrame, note that this is a reference counted object.
 class WEB_EXPORT WebLocalFrameImpl final
-    : public GarbageCollectedFinalized<WebLocalFrameImpl>,
-      NON_EXPORTED_BASE(public WebLocalFrameBase) {
+    : NON_EXPORTED_BASE(public WebLocalFrameBase) {
  public:
   // WebFrame methods:
   // TODO(dcheng): Fix sorting here; a number of method have been moved to
   // WebLocalFrame but not correctly updated here.
   void Close() override;
   WebString AssignedName() const override;
   void SetName(const WebString&) override;
   WebVector<WebIconURL> IconURLs(int icon_types_mask) const override;
   void SetSharedWorkerRepositoryClient(
       WebSharedWorkerRepositoryClient*) override;
@@ skipping 213 matching lines @@
   void UsageCountChromeLoadTimes(const WebString& metric) override;
   base::SingleThreadTaskRunner* TimerTaskRunner() override;
   base::SingleThreadTaskRunner* LoadingTaskRunner() override;
   base::SingleThreadTaskRunner* UnthrottledTaskRunner() override;
   WebInputMethodControllerImpl* GetInputMethodController() const override;
 
   void ExtractSmartClipData(WebRect rect_in_viewport,
                             WebString& clip_text,
                             WebString& clip_html) override;
 
-  void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name);
+  void InitializeCoreFrame(Page&,
+                           FrameOwner*,
+                           const AtomicString& name) override;
   LocalFrame* GetFrame() const override { return frame_.Get(); }
 
   void WillBeDetached();
   void WillDetachParent();
 
   static WebLocalFrameImpl* Create(WebTreeScopeType,
                                    WebFrameClient*,
                                    blink::InterfaceProvider*,
                                    blink::InterfaceRegistry*,
                                    WebFrame* opener);
@@ skipping 95 matching lines @@
   WebDevToolsFrontendImpl* DevToolsFrontend() {
     return web_dev_tools_frontend_;
   }
 
   WebNode ContextMenuNode() const { return context_menu_node_.Get(); }
   void SetContextMenuNode(Node* node) override { context_menu_node_ = node; }
   void ClearContextMenuNode() override { context_menu_node_.Clear(); }
 
   std::unique_ptr<WebURLLoader> CreateURLLoader() override;
 
-  DECLARE_TRACE();
+  DECLARE_VIRTUAL_TRACE();
 
  private:
   friend class LocalFrameClientImpl;
 
   WebLocalFrameImpl(WebTreeScopeType,
                     WebFrameClient*,
                     blink::InterfaceProvider*,
                     blink::InterfaceRegistry*);
   WebLocalFrameImpl(WebRemoteFrame*,
                     WebFrameClient*,
@@ skipping 74 matching lines @@
 
 DEFINE_TYPE_CASTS(WebLocalFrameImpl,
                   WebFrame,
                   frame,
                   frame->IsWebLocalFrame(),
                   frame.IsWebLocalFrame());
 
 }  // namespace blink
 
 #endif