Simplify tests by using Web*Impl types directly.

third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/ExternalPopupMenu.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 107 matching lines @@
         URLTestHelpers::registerMockedURLLoad(URLTestHelpers::toKURL(m_baseURL + fileName), WebString::fromUTF8(fileName.c_str()), WebString::fromUTF8("popup/"), WebString::fromUTF8("text/html"));
     }
 
     void loadFrame(const std::string& fileName)
     {
         FrameTestHelpers::loadFrame(mainFrame(), m_baseURL + fileName);
         webView()->resize(WebSize(800, 600));
         webView()->updateAllLifecyclePhases();
     }
 
-    WebViewImpl* webView() const { return m_helper.webViewImpl(); }
+    WebViewImpl* webView() const { return m_helper.webView(); }
     const ExternalPopupMenuWebFrameClient& client() const { return m_webFrameClient; }
-    WebLocalFrameImpl* mainFrame() const { return m_helper.webViewImpl()->mainFrameImpl(); }
+    WebLocalFrameImpl* mainFrame() const { return m_helper.webView()->mainFrameImpl(); }
 
 private:
     std::string m_baseURL;
     FrameTestHelpers::TestWebViewClient m_webViewClient;
     ExternalPopupMenuWebFrameClient m_webFrameClient;
     FrameTestHelpers::WebViewHelper m_helper;
 };
 
 TEST_F(ExternalPopupMenuTest, PopupAccountsForVisualViewportOffset)
 {
@@ skipping 74 matching lines @@
     ASSERT_TRUE(select->popupIsVisible());
 
     WebExternalPopupMenuClient* client = static_cast<ExternalPopupMenu*>(select->popup());
     WebVector<int> indices;
     client->didAcceptIndices(indices);
     EXPECT_FALSE(select->popupIsVisible());
     EXPECT_EQ(-1, select->selectedIndex());
 }
 
 } // namespace blink