Clean up names and remove unnecessary parameter

third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp

 // Copyright 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 "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/html/HTMLElement.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebDocument.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 using blink::FrameTestHelpers::loadFrame;
 using blink::testing::runPendingTasks;
 using blink::URLTestHelpers::registerMockedURLFromBaseURL;
 
 namespace blink {
 
 class ImeRequestTrackingWebViewClient
     : public FrameTestHelpers::TestWebViewClient {
  public:
-  ImeRequestTrackingWebViewClient() : m_imeRequestCount(0) {}
+  ImeRequestTrackingWebViewClient() : m_virtualKeyboardRequestCount(0) {}
 
   // WebWidgetClient methods
-  void showImeIfNeeded() override { ++m_imeRequestCount; }
+  void showVirtualKeyboard() override { ++m_virtualKeyboardRequestCount; }
 
   // Local methds
-  void reset() { m_imeRequestCount = 0; }
+  void reset() { m_virtualKeyboardRequestCount = 0; }
 
-  int imeRequestCount() { return m_imeRequestCount; }
+  int virtualKeyboardRequestCount() { return m_virtualKeyboardRequestCount; }
 
  private:
-  int m_imeRequestCount;
+  int m_virtualKeyboardRequestCount;
 };
 
 class ImeOnFocusTest : public ::testing::Test {
  public:
   ImeOnFocusTest() : m_baseURL("http://www.test.com/") {}
 
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
@@ skipping 28 matching lines @@
 
   webView->handleInputEvent(webGestureEvent);
   runPendingTasks();
 }
 
 void ImeOnFocusTest::focus(const AtomicString& element) {
   m_document->body()->getElementById(element)->focus();
 }
 
 void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
-                                       int expectedImeRequestCount,
+                                       int expectedVirtualKeyboardRequestCount,
                                        IntPoint tapPoint,
                                        const AtomicString& focusElement,
                                        std::string frame) {
   ImeRequestTrackingWebViewClient client;
   registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
                                WebString::fromUTF8(fileName));
   WebViewImpl* webView = m_webViewHelper.initialize(true, 0, &client);
   webView->resize(WebSize(800, 1200));
   loadFrame(webView->mainFrame(), m_baseURL + fileName);
   m_document =
       m_webViewHelper.webView()->mainFrameImpl()->document().unwrap<Document>();
 
   if (!focusElement.isNull())
     focus(focusElement);
-  EXPECT_EQ(0, client.imeRequestCount());
+  EXPECT_EQ(0, client.virtualKeyboardRequestCount());
 
   if (tapPoint.x() >= 0 && tapPoint.y() >= 0)
     sendGestureTap(webView, tapPoint);
 
   if (!frame.empty()) {
     registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
                                  WebString::fromUTF8(frame));
     WebFrame* childFrame = webView->mainFrame()->firstChild();
     loadFrame(childFrame, m_baseURL + frame);
   }
 
   if (!focusElement.isNull())
     focus(focusElement);
-  EXPECT_EQ(expectedImeRequestCount, client.imeRequestCount());
+  EXPECT_EQ(expectedVirtualKeyboardRequestCount,
+            client.virtualKeyboardRequestCount());
 
   m_webViewHelper.reset();
 }
 
 TEST_F(ImeOnFocusTest, OnLoad) {
   runImeOnFocusTest("ime-on-focus-on-load.html", 0);
 }
 
 TEST_F(ImeOnFocusTest, OnAutofocus) {
   runImeOnFocusTest("ime-on-focus-on-autofocus.html", 0);
@@ skipping 12 matching lines @@
   runImeOnFocusTest("ime-on-focus-after-navigation-within-page.html", 1,
                     IntPoint(50, 50), "input");
 }
 
 TEST_F(ImeOnFocusTest, AfterFrameLoadOnGesture) {
   runImeOnFocusTest("ime-on-focus-after-frame-load-on-gesture.html", 1,
                     IntPoint(50, 50), "input", "frame.html");
 }
 
 }  // namespace blink