Change all test cases to use WebViewBase instead of WebViewImpl.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 255 matching lines @@
 
   WebColor color_;
 };
 
 }  // namespace
 
 // WebView ----------------------------------------------------------------
 
 WebView* WebView::Create(WebViewClient* client,
                          WebPageVisibilityState visibility_state) {
-  // Pass the WebViewImpl's self-reference to the caller.
+  return WebViewBase::Create(client, visibility_state);
+}
+
+WebViewBase* WebViewBase::Create(WebViewClient* client,
+                                 WebPageVisibilityState visibility_state) {
   return WebViewImpl::Create(client, visibility_state);
 }
 
-WebViewImpl* WebViewImpl::Create(WebViewClient* client,
+WebViewBase* WebViewImpl::Create(WebViewClient* client,
                                  WebPageVisibilityState visibility_state) {
   // Pass the WebViewImpl's self-reference to the caller.
   return AdoptRef(new WebViewImpl(client, visibility_state)).LeakRef();
 }
 
 const WebInputEvent* WebViewBase::CurrentInputEvent() {
   return WebViewImpl::CurrentInputEvent();
 }
 
 void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ skipping 1476 matching lines @@
 }
 
 Frame* WebViewImpl::FocusedCoreFrame() const {
   return page_ ? page_->GetFocusController().FocusedOrMainFrame() : nullptr;
 }
 
 WebViewBase* WebViewBase::FromPage(Page* page) {
   return WebViewImpl::FromPage(page);
 }
 
-WebViewImpl* WebViewImpl::FromPage(Page* page) {
-  return page ? static_cast<WebViewImpl*>(page->GetChromeClient().WebView())
+WebViewBase* WebViewImpl::FromPage(Page* page) {
+  return page ? static_cast<WebViewBase*>(page->GetChromeClient().WebView())
               : nullptr;
 }
 
 // WebWidget ------------------------------------------------------------------
 
 void WebViewImpl::Close() {
   DCHECK(AllInstances().Contains(this));
   AllInstances().erase(this);
 
   if (page_) {
@@ skipping 364 matching lines @@
 
 bool WebViewImpl::HasVerticalScrollbar() {
   return MainFrameImpl()
       ->GetFrameView()
       ->LayoutViewportScrollableArea()
       ->VerticalScrollbar();
 }
 
 const WebInputEvent* WebViewImpl::current_input_event_ = nullptr;
 
+void WebViewBase::SetCurrentInputEventForTest(const WebInputEvent* event) {

[haraken, 2017/05/04 05:30:42]

It looks a bit strange that WebViewBase's method is defined in
WebViewImpl.cpp... ?

[slangley, 2017/05/04 09:15:34]

This is the same as WebView::Create(), the other option would be to move the
static to WebViewBase, but it didn't seem worth it.

[haraken, 2017/05/04 15:14:31]

Can we make current_input_event_ a non-static member and use a virtual method?
i.e., WebViewBase::SetCurrentInputEventForTest redirects to
WebViewImpl::SetCurrentInputEventForTest.

If it really needs to be a static variable, I don't think WebViewImpl is a right
place to put it.

+  WebViewImpl::SetCurrentInputEventForTest(event);
+}
+
 WebInputEventResult WebViewImpl::HandleInputEvent(
     const WebCoalescedInputEvent& coalesced_event) {
   const WebInputEvent& input_event = coalesced_event.Event();
   // TODO(dcheng): The fact that this is getting called when there is no local
   // main frame is problematic and probably indicates a bug in the input event
   // routing code.
   if (!MainFrameImpl())
     return WebInputEventResult::kNotHandled;
 
   GetPage()->GetVisualViewport().StartTrackingPinchStats();
@@ skipping 2007 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink