| Index: Source/web/tests/ImeOnFocusTest.cpp
|
| diff --git a/Source/web/tests/ImeOnFocusTest.cpp b/Source/web/tests/ImeOnFocusTest.cpp
|
| index 57aad794871c1bb4c66eea15b5c3152fe2b6a31d..4380755e63975ed52a9d4bfb543dea0279dad6a3 100644
|
| --- a/Source/web/tests/ImeOnFocusTest.cpp
|
| +++ b/Source/web/tests/ImeOnFocusTest.cpp
|
| @@ -15,15 +15,13 @@
|
| #include "public/web/WebDocument.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/tests/FrameTestHelpers.h"
|
| -
|
| #include <gtest/gtest.h>
|
|
|
| -using namespace blink;
|
| using blink::FrameTestHelpers::loadFrame;
|
| using blink::testing::runPendingTasks;
|
| -using URLTestHelpers::registerMockedURLFromBaseURL;
|
| +using blink::URLTestHelpers::registerMockedURLFromBaseURL;
|
|
|
| -namespace {
|
| +namespace blink {
|
|
|
| class ImeRequestTrackingWebViewClient : public FrameTestHelpers::TestWebViewClient {
|
| public:
|
| @@ -33,7 +31,7 @@ public:
|
| }
|
|
|
| // WebWidgetClient methods
|
| - virtual void showImeIfNeeded() override
|
| + void showImeIfNeeded() override
|
| {
|
| ++m_imeRequestCount;
|
| }
|
| @@ -60,15 +58,15 @@ public:
|
| {
|
| }
|
|
|
| - virtual void TearDown()
|
| + void TearDown() override
|
| {
|
| Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
|
| }
|
|
|
| protected:
|
| void sendGestureTap(WebView*, IntPoint);
|
| - void focus(const WTF::AtomicString& element);
|
| - void runImeOnFocusTest(std::string fileName, int, IntPoint tapPoint = IntPoint(-1, -1), const WTF::AtomicString& focusElement = WTF::nullAtom, std::string frame = "");
|
| + void focus(const AtomicString& element);
|
| + void runImeOnFocusTest(std::string fileName, int, IntPoint tapPoint = IntPoint(-1, -1), const AtomicString& focusElement = nullAtom, std::string frame = "");
|
|
|
| std::string m_baseURL;
|
| FrameTestHelpers::WebViewHelper m_webViewHelper;
|
| @@ -91,12 +89,12 @@ void ImeOnFocusTest::sendGestureTap(WebView* webView, IntPoint clientPoint)
|
| runPendingTasks();
|
| }
|
|
|
| -void ImeOnFocusTest::focus(const WTF::AtomicString& element)
|
| +void ImeOnFocusTest::focus(const AtomicString& element)
|
| {
|
| m_document->body()->getElementById(element)->focus();
|
| }
|
|
|
| -void ImeOnFocusTest::runImeOnFocusTest(std::string fileName, int expectedImeRequestCount, IntPoint tapPoint, const WTF::AtomicString& focusElement, std::string frame)
|
| +void ImeOnFocusTest::runImeOnFocusTest(std::string fileName, int expectedImeRequestCount, IntPoint tapPoint, const AtomicString& focusElement, std::string frame)
|
| {
|
| ImeRequestTrackingWebViewClient client;
|
| registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL), WebString::fromUTF8(fileName));
|
| @@ -155,4 +153,4 @@ TEST_F(ImeOnFocusTest, AfterFrameLoadOnGesture)
|
| runImeOnFocusTest("ime-on-focus-after-frame-load-on-gesture.html", 1, IntPoint(50, 50), "input", "frame.html");
|
| }
|
|
|
| -}
|
| +} // namespace blink
|
|
|