Simplify tests by using Web*Impl types directly.

third_party/WebKit/Source/web/tests/FrameTestHelpers.h

Index: third_party/WebKit/Source/web/tests/FrameTestHelpers.h
diff --git a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h
index deb0052ceb675007d2141e4a79dac7a63bac39ed..611167809202435af16c5af5c9a5de39bc87e7da 100644
--- a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h
+++ b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h
@@ -51,8 +51,7 @@ namespace blink {
 
 class WebFrame;
 class WebFrameWidget;
-class WebLocalFrame;
-class WebRemoteFrame;
+class WebLocalFrameImpl;
 class WebRemoteFrameImpl;
 class WebSettings;
 enum class WebCachePolicy;
@@ -84,8 +83,8 @@ WebMouseEvent createMouseEvent(WebInputEvent::Type, WebMouseEvent::Button, const
 // Calls WebRemoteFrame::createLocalChild, but with some arguments prefilled
 // with default test values (i.e. with a default |client| or |properties| and/or
 // with a precalculated |uniqueName|).
-WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name = WebString(), WebFrameClient* = nullptr, WebWidgetClient* = nullptr, WebFrame* previousSibling = nullptr, const WebFrameOwnerProperties& = WebFrameOwnerProperties());
-WebRemoteFrame* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient*, const WebString& name = WebString());
+WebLocalFrameImpl* createLocalChild(WebRemoteFrame* parent, const WebString& name = WebString(), WebFrameClient* = nullptr, WebWidgetClient* = nullptr, WebFrame* previousSibling = nullptr, const WebFrameOwnerProperties& = WebFrameOwnerProperties());
+WebRemoteFrameImpl* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient*, const WebString& name = WebString());
 
 // Helpers for unit tests with parameterized WebSettings overrides.
 typedef void (*SettingOverrideFunction)(WebSettings*);
@@ -197,8 +196,7 @@ public:
 
     void reset();
 
-    WebView* webView() const { return m_webView; }
-    WebViewImpl* webViewImpl() const { return m_webView; }
+    WebViewImpl* webView() const { return m_webView; }
 
 private:
     WebViewImpl* m_webView;