Move WebFrame to use WebLocalFrameBase instead of WebLocalFrameImpl.

third_party/WebKit/Source/web/WebLocalFrameImpl.h

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.h
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.h b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
index 9ac95a81c2735e8e6c211891b0cf2b3070bb4c12..a5dc770ba7355a51e9ea4dfa56ea50670f86de5b 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
@@ -84,8 +84,7 @@ 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
@@ -319,7 +318,9 @@ class WEB_EXPORT WebLocalFrameImpl final
                             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();
@@ -433,7 +434,7 @@ class WEB_EXPORT WebLocalFrameImpl final
   void SetContextMenuNode(Node* node) override { context_menu_node_ = node; }
   void ClearContextMenuNode() override { context_menu_node_.Clear(); }
 
-  DECLARE_TRACE();
+  DECLARE_VIRTUAL_TRACE();
 
  private:
   friend class LocalFrameClientImpl;